Remove unused stuff for cumulus (#178)

inventories/group_vars/partition/metal_core.yaml

@@ -1,9 +1,4 @@
 ---
-metal_core_change_boot_order: false
-
-metal_core_nsqd_ca_cert: "{{ lookup('file', 'certs/ca.pem') }}"
-metal_core_nsqd_client_cert: "{{ lookup('file', 'certs/nsq/client.crt') }}"
-
 metal_core_rack_id: test-rack
 
 metal_core_log_level: debug

inventories/partition.yaml

@@ -38,8 +38,3 @@ leaves:
     ansible_python_interpreter: /usr/bin/python
     ansible_user: root
     ansible_ssh_private_key_file: "{{ playbook_dir }}/files/ssh/id_rsa"
-
-cumulus:
-  vars:
-    router_enable_static_route_leak: true
-sonic:

mini-lab.cumulus.yaml

@@ -13,19 +13,15 @@ topology:
       labels:
         ansible-group: cumulus
       binds:
+        - apt-transport-https.tar.gz:/root/jessie-apt-transport-fix.tar.gz
         - files/ssh/id_rsa.pub:/root/.ssh/authorized_keys
-
   nodes:
     mini_lab_ext:
       kind: bridge
     leaf01:
       kind: cvx
-      binds:
-        - apt-transport-https.tar.gz:/root/jessie-apt-transport-fix.tar.gz
     leaf02:
       kind: cvx
-      binds:
-        - apt-transport-https.tar.gz:/root/jessie-apt-transport-fix.tar.gz
     inet:
       kind: linux
       image: quay.io/frrouting/frr:10.0.1

roles/cumulus/handlers/main.yaml

@@ -25,25 +25,6 @@
     enabled: true
     state: restarted
 
-- name: reload interfaces
-  shell: sleep 3; ifreload -a
-  async: 1
-  poll: 0
-  notify: wait for new connection
-
-- name: wait for new connection
-  wait_for_connection:
-    connect_timeout: 20
-    sleep: 5
-    delay: 5
-    timeout: 300
-
-- name: reload frr
-  service:
-    name: frr
-    enabled: true
-    state: reloaded
-
 - name: restart frr
   service:
     name: frr
@@ -55,9 +36,3 @@
     name: lldpd
     enabled: true
     state: restarted
-
-- name: restart ntp@mgmt
-  service:
-    name: ntp@mgmt
-    enabled: true
-    state: restarted

roles/cumulus/tasks/router.yaml

@@ -1,7 +1,6 @@
 ---
 - name: configure mgmt vrf
   import_tasks: mgmt_vrf.yaml
-  when: router_enable_mgmt_vrf
 
 - name: configure switch plane
   import_tasks: switch_plane.yaml
@@ -37,25 +36,6 @@
     state: restarted
   when: ("macaddress" not in lldpd_subtype_check.stdout)
 
-- name: populate service facts
-  service_facts:
-
-- name: render interfaces configuration
-  template:
-    src: interfaces.j2
-    dest: /etc/network/interfaces
-    validate: '/sbin/ifup --syntax-check --all --interfaces %s'
-  notify: reload interfaces
-  when: "ansible_facts.services['metal-core.service'] is not defined"
-
-- name: render custom interfaces configuration section
-  copy:
-    content: "{{ custom_interface_section }}"
-    dest: /etc/network/interfaces.d/99_custom.intf
-    validate: '/sbin/ifup --syntax-check --all --interfaces %s'
-  notify: reload interfaces
-  when: custom_interface_section is defined
-
 - name: render resolv.conf
   template:
     src: resolv.conf.j2
@@ -68,16 +48,6 @@
     dest: /etc/frr/daemons
   notify: restart frr
 
-- name: render frr configuration
-  template:
-    src: frr.conf.j2
-    dest: /etc/frr/frr.conf
-    validate: '/usr/bin/vtysh --dryrun --inputfile %s'
-  tags: frr
-  register: frr_rendered
-  notify: reload frr
-  when: "ansible_facts.services['metal-core.service'] is not defined"
-
 - name: set hostname
   nclu:
     commands:

roles/cumulus/tasks/switch_plane.yaml

@@ -10,5 +10,4 @@
     path: /etc/cumulus/switchd.conf
     regexp: '#vrf_route_leak_enable = FALSE'
     replace: 'vrf_route_leak_enable = TRUE'
-  when: router_enable_static_route_leak
   notify: restart switchd