Merge cumulus roles.

metal-stack · May 2, 2024 · 9876a74 · 9876a74
1 parent 7ff9bf3
commit 9876a74
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 27 deletions.
diff --git a/deploy_partition.yaml b/deploy_partition.yaml
@@ -16,14 +16,6 @@
       tags: sonic
 
 - name: Configure Cumulus switches
-  hosts: leaves:&cumulus
-  roles:
-    - name: leaf
-      tags: leaf
-    - name: internet
-      tags: internet
-
-- name: Deploy docker on Cumulus switches
   hosts: leaves:&cumulus
   pre_tasks:
     # the following task is not required as long as we do not install something from the cumulus repositories, for which all the keys are expired now
@@ -38,6 +30,8 @@
     - name: install apt-transport
       shell: dpkg -i /root/https-deps/*.deb && apt-get install -fy
   roles:
+    - name: cumulus
+      tags: cumulus
     - name: metal-roles/partition/roles/docker-on-cumulus
       tags: docker-on-cumulus
 

diff --git a/inventories/partition.yaml b/inventories/partition.yaml
@@ -38,3 +38,8 @@ 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:
diff --git a/roles/router/defaults/main.yaml → roles/cumulus/defaults/main.yaml b/roles/router/defaults/main.yaml → roles/cumulus/defaults/main.yaml
diff --git a/...ter/files/99control_plane_catch_all.rules → ...lus/files/99control_plane_catch_all.rules b/...ter/files/99control_plane_catch_all.rules → ...lus/files/99control_plane_catch_all.rules
diff --git a/roles/leaf/files/bridgemac.json → roles/cumulus/files/bridgemac.json b/roles/leaf/files/bridgemac.json → roles/cumulus/files/bridgemac.json
diff --git a/roles/router/files/daemons → roles/cumulus/files/daemons b/roles/router/files/daemons → roles/cumulus/files/daemons
diff --git a/roles/router/files/frr-validation@.service → roles/cumulus/files/frr-validation@.service b/roles/router/files/frr-validation@.service → roles/cumulus/files/frr-validation@.service
diff --git a/roles/internet/files/frr.tpl → roles/cumulus/files/frr.tpl b/roles/internet/files/frr.tpl → roles/cumulus/files/frr.tpl
diff --git a/roles/router/files/ifreload.service → roles/cumulus/files/ifreload.service b/roles/router/files/ifreload.service → roles/cumulus/files/ifreload.service
diff --git a/...uter/files/interfaces-validation@.service → ...ulus/files/interfaces-validation@.service b/...uter/files/interfaces-validation@.service → ...ulus/files/interfaces-validation@.service
diff --git a/roles/router/files/lldpd.d/portsubtype.conf → roles/cumulus/files/lldpd.d/portsubtype.conf b/roles/router/files/lldpd.d/portsubtype.conf → roles/cumulus/files/lldpd.d/portsubtype.conf
diff --git a/roles/router/files/lldpd.d/tx-interval.conf → roles/cumulus/files/lldpd.d/tx-interval.conf b/roles/router/files/lldpd.d/tx-interval.conf → roles/cumulus/files/lldpd.d/tx-interval.conf
diff --git a/roles/router/handlers/main.yaml → roles/cumulus/handlers/main.yaml b/roles/router/handlers/main.yaml → roles/cumulus/handlers/main.yaml
@@ -1,4 +1,17 @@
 ---
+- 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 systemd
   systemd:
     daemon_reload: yes

diff --git a/roles/internet/tasks/main.yaml → roles/cumulus/tasks/internet.yaml b/roles/internet/tasks/main.yaml → roles/cumulus/tasks/internet.yaml
@@ -12,7 +12,7 @@
     src: internet.intf.j2
     dest: /etc/network/interfaces.d/internet.intf
 
-# add the vniInternet inferface to the bridge and configure the new vid at the bridge
+# add the vniInternet interface to the bridge and configure the new vid at the bridge
 # otherwise ifreload will not work
 - name: add internet vni to bridge
   command: net add bridge bridge ports vniInternet

diff --git a/roles/leaf/tasks/main.yaml → roles/cumulus/tasks/main.yaml b/roles/leaf/tasks/main.yaml → roles/cumulus/tasks/main.yaml
@@ -1,9 +1,5 @@
 ---
-- name: configure leaf
-  include_role:
-    name: router
-  vars:
-    router_enable_static_route_leak: true
+- import_tasks: router.yaml
 
 - name: flush handlers
   meta: flush_handlers
@@ -31,3 +27,5 @@
     src: bridgemac.json
     dest: /etc/network/ifupdown2/policy.d/bridgemac.json
   notify: reload interfaces
+
+- import_tasks: internet.yaml
diff --git a/roles/router/tasks/mgmt_vrf.yaml → roles/cumulus/tasks/mgmt_vrf.yaml b/roles/router/tasks/mgmt_vrf.yaml → roles/cumulus/tasks/mgmt_vrf.yaml
diff --git a/roles/router/tasks/main.yaml → roles/cumulus/tasks/router.yaml b/roles/router/tasks/main.yaml → roles/cumulus/tasks/router.yaml
diff --git a/roles/router/tasks/switch_plane.yaml → roles/cumulus/tasks/switch_plane.yaml b/roles/router/tasks/switch_plane.yaml → roles/cumulus/tasks/switch_plane.yaml
diff --git a/roles/leaf/templates/frr.conf.j2 → roles/cumulus/templates/frr.conf.j2 b/roles/leaf/templates/frr.conf.j2 → roles/cumulus/templates/frr.conf.j2
diff --git a/roles/leaf/templates/interfaces.j2 → roles/cumulus/templates/interfaces.j2 b/roles/leaf/templates/interfaces.j2 → roles/cumulus/templates/interfaces.j2
diff --git a/roles/internet/templates/internet.intf.j2 → roles/cumulus/templates/internet.intf.j2 b/roles/internet/templates/internet.intf.j2 → roles/cumulus/templates/internet.intf.j2
diff --git a/roles/router/templates/ports.conf.j2 → roles/cumulus/templates/ports.conf.j2 b/roles/router/templates/ports.conf.j2 → roles/cumulus/templates/ports.conf.j2
diff --git a/roles/router/templates/resolv.conf.j2 → roles/cumulus/templates/resolv.conf.j2 b/roles/router/templates/resolv.conf.j2 → roles/cumulus/templates/resolv.conf.j2
diff --git a/roles/leaf/handlers/main.yaml b/roles/leaf/handlers/main.yaml