Critical fix: FRR daemons not started

The changes in configuration deployment playbook modified the 'module'
parameter passed to initial configuration deployment, destroying the
logic that enabled FRR daemons on FRR/CL

This fix removes the modification of the 'module' variable and replaces
it with a hard-coded check for 'initial' module

Author: ipspace

legacy/setup.py

@@ -4,7 +4,7 @@
 
 sys.path.append('..')
 
-version="1.4.3"
+version="1.4.3-post1"
 
 setup(
   name="netsim-tools",

netsim/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "1.4.3"
+__version__ = "1.4.3-post1"

netsim/ansible/initial-config.ansible

@@ -48,7 +48,6 @@
         vars:
           config_module: initial
           paths: [ "../templates" ]
-          module: [ initial ]
         tags: [ always ]
     tags: [ initial ]
 

netsim/ansible/tasks/deploy-module.yml

@@ -53,4 +53,4 @@
           netsim_action: "{{ config_module }}"
         tags: [ always ]
 
-  when: config_module in module|default([])
+  when: config_module in module|default([]) or config_module == 'initial'

netsim/ansible/templates/initial/cumulus.j2

@@ -60,21 +60,8 @@ configure system interface pattern *,!eth0,swp*
 CONFIG
 service lldpd restart
 #
-# Enable FRR modules
-#
-{% set modlist = {'bgp':'bgpd','ospf':['ospfd','ospf6d'],'isis':'isisd','vrf':'bgpd','gateway':'vrrpd'} %}
-{% for m in module|default([]) if modlist[m] is defined %}
-{%   for frr_m in [modlist[m]]|flatten %}
-echo "{{ frr_m }}=yes" >>/etc/frr/daemons
-{%   endfor %}
-{% endfor %}
-systemctl enable frr.service
-systemctl start frr.service
-systemctl reload frr.service
-#
 # Create loopback interface entry
 #
-
 {%- macro loopback_interface(name,data,create) %}
 auto {{ name }}
 {% if create %}
@@ -129,6 +116,18 @@ ifreload -a
 sysctl -qw net.ipv6.conf.{{ l.ifname }}.disable_ipv6=0
 {% endfor %}
 #
+# Enable FRR modules for {{ module|default('none') }}
+#
+systemctl enable frr.service
+systemctl start frr.service
+{% set modlist = {'bgp':'bgpd','ospf':['ospfd','ospf6d'],'isis':'isisd','vrf':'bgpd','gateway':'vrrpd'} %}
+{% for m in module|default([]) if modlist[m] is defined %}
+{%   for frr_m in [modlist[m]]|flatten %}
+echo "{{ frr_m }}=yes" >>/etc/frr/daemons
+{%   endfor %}
+{% endfor %}
+systemctl reload frr.service
+#
 # Rest of initial configuration done through VTYSH
 #
 cat >/tmp/config <<CONFIG