Merge branch 'master' into mixed-flavor

Makefile

@@ -83,7 +83,9 @@ partition: partition-bake
 .PHONY: partition-bake
 partition-bake:
 	docker pull $(MINI_LAB_VM_IMAGE)
-
+ifeq ($(MINI_LAB_FLAVOR),sonic)
+	docker pull $(MINI_LAB_SONIC_IMAGE)
+endif
 	@if ! sudo $(CONTAINERLAB) --topo $(LAB_TOPOLOGY) inspect | grep -i leaf01 > /dev/null; then \
 		sudo --preserve-env $(CONTAINERLAB) deploy --topo $(LAB_TOPOLOGY) --reconfigure && \
 		./scripts/deactivate_offloading.sh; fi

deploy_partition.yaml

@@ -16,14 +16,6 @@
       tags: sonic
 
 - name: Configure Cumulus switches
-  hosts: leaves:&cumulus
-  roles:
-    - name: metal-roles/partition/roles/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
 

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:

roles/cumulus/defaults/main.yaml

@@ -0,0 +1,5 @@
+---
+router_enable_mgmt_vrf: true
+router_enable_static_route_leak: false
+
+router_nameservers: []

roles/cumulus/files/99control_plane_catch_all.rules

@@ -0,0 +1,36 @@
+#
+# Note: These are catch-all rules that shall be last in the over all rule set.
+#
+
+INGRESS_INTF = swp+
+
+INGRESS_CHAIN = INPUT
+
+
+
+[iptables]
+
+-A $INGRESS_CHAIN --in-interface $INGRESS_INTF -m addrtype --dst-type LOCAL -j POLICE --set-mode pkt --set-rate 1000 --set-burst 10000 --set-class 2
+
+-A $INGRESS_CHAIN --in-interface $INGRESS_INTF -m addrtype --dst-type IPROUTER -j POLICE --set-mode pkt --set-rate 30000 --set-burst 70000 --set-class 2
+
+-A $INGRESS_CHAIN --in-interface $INGRESS_INTF -j SETCLASS --class 0
+
+
+[ip6tables]
+
+-A $INGRESS_CHAIN --in-interface $INGRESS_INTF -m addrtype --dst-type LOCAL -j POLICE --set-mode pkt --set-rate 1000 --set-burst 1000 --set-class 2
+
+-A $INGRESS_CHAIN --in-interface $INGRESS_INTF -m addrtype --dst-type IPROUTER -j POLICE --set-mode pkt --set-rate 400 --set-burst 100 --set-class 2
+
+-A $INGRESS_CHAIN --in-interface $INGRESS_INTF -j SETCLASS --class 0
+
+
+[ebtables]
+
+-A $INGRESS_CHAIN -p ipv4 --in-interface $INGRESS_INTF -j ACCEPT
+-A $INGRESS_CHAIN -p ipv6 --in-interface $INGRESS_INTF -j ACCEPT
+-A $INGRESS_CHAIN --in-interface $INGRESS_INTF -j setclass --class 0
+# ipv4 multicast misses
+-A $INGRESS_CHAIN -p ipv4 -d 01:00:5e:00:00:00/ff:ff:ff:80:00:00 -j police --set-mode pkt --set-rate 100 --set-burst 100
+-A $INGRESS_CHAIN -j police --set-mode pkt --set-rate 100 --set-burst 100

roles/cumulus/files/bridgemac.json

@@ -0,0 +1,7 @@
+{
+  "bridge": {
+    "module_globals": {
+      "bridge_mac_iface": ["eth0", "eth1"]
+    }
+  }
+}

roles/cumulus/files/daemons

@@ -0,0 +1,2 @@
+bgpd=yes
+zebra=yes

roles/cumulus/files/frr-validation@.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Trigger a validation run of a frr configuration file %I
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/vtysh --dryrun --inputfile %I
+StandardOutput=journal
+
+[Install]
+WantedBy=multi-user.target

roles/cumulus/files/ifreload.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Trigger Interface Reload with ifreload
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/ifreload -v -a
+StandardOutput=journal
+
+[Install]
+WantedBy=multi-user.target

roles/cumulus/files/interfaces-validation@.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Trigger a validation of a network interfaces file %I
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/ifup --syntax-check --verbose --all --interfaces %I
+StandardOutput=journal
+
+[Install]
+WantedBy=multi-user.target

roles/cumulus/files/lldpd.d/portsubtype.conf

@@ -0,0 +1,2 @@
+configure lldp portidsubtype macaddress
+

roles/cumulus/files/lldpd.d/tx-interval.conf

@@ -0,0 +1 @@
+configure lldp tx-interval 10

roles/cumulus/handlers/main.yaml

@@ -0,0 +1,63 @@
+---
+- 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
+
+- name: reload sysctl
+  command: sysctl --system
+
+- name: restart switchd
+  service:
+    name: switchd.service
+    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
+    enabled: true
+    state: restarted
+
+- name: lldpd restart
+  service:
+    name: lldpd
+    enabled: true
+    state: restarted
+
+- name: restart ntp@mgmt
+  service:
+    name: ntp@mgmt
+    enabled: true
+    state: restarted

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

roles/cumulus/tasks/main.yaml

@@ -0,0 +1,31 @@
+---
+- import_tasks: router.yaml
+
+- name: flush handlers
+  meta: flush_handlers
+
+- name: masquerade for eth0
+  iptables:
+    table: nat
+    chain: POSTROUTING
+    out_interface: eth0
+    jump: MASQUERADE
+
+- name: check for static route in mgmt vrf
+  command: ip r s vrf mgmt
+  register: route_check
+  changed_when: false
+
+- name: ensure that static route for return path to pxe network is present
+  command: "ip r a 10.0.1.0/24 vrf mgmt via {{ dhcp_server_ip }} dev vlan4000"
+  when:
+    - '"10.0.1.0/24" not in route_check.stdout'
+    - dhcp_server_ip is defined
+
+- name: create bridgemac.json
+  copy:
+    src: bridgemac.json
+    dest: /etc/network/ifupdown2/policy.d/bridgemac.json
+  notify: reload interfaces
+
+- import_tasks: internet.yaml

roles/cumulus/tasks/mgmt_vrf.yaml

@@ -0,0 +1,22 @@
+---
+- name: check if mgmt vrf is active
+  shell: vrf list | grep mgmt
+  changed_when: false
+  failed_when: false
+  register: mgmt_vrf_exists
+
+- name: activate mgmt vrf; drops connections
+  nclu:
+    commands:
+      - add vrf mgmt
+    commit: true
+  async: 1
+  poll: 0
+  when: mgmt_vrf_exists.rc != 0
+
+- name: wait for new connection
+  wait_for_connection:
+    connect_timeout: 20
+    sleep: 2
+    delay: 6
+    timeout: 60

roles/cumulus/tasks/router.yaml

@@ -0,0 +1,85 @@
+---
+- name: configure mgmt vrf
+  import_tasks: mgmt_vrf.yaml
+  when: router_enable_mgmt_vrf
+
+- name: configure switch plane
+  import_tasks: switch_plane.yaml
+  when: ports is defined
+
+- name: flush handlers
+  meta: flush_handlers
+
+- name: install services
+  copy:
+    src: "{{ item }}"
+    dest: "/etc/systemd/system/{{ item }}"
+  notify: reload systemd
+  with_items:
+    - frr-validation@.service
+    - interfaces-validation@.service
+    - ifreload.service
+
+- name: copy lldpd configs
+  copy:
+    src: lldpd.d/
+    dest: /etc/lldpd.d/
+  notify: lldpd restart
+
+- name: check if lldpd has the correct portidsubtype setting
+  shell: lldpcli show configuration | grep subtype
+  register: lldpd_subtype_check
+  changed_when: false
+
+- name: trigger lldpd restart if portidsubtype setting is wrong
+  service:
+    name: lldpd
+    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
+    dest: /etc/resolv.conf
+  notify: reload interfaces
+
+- name: enable frr daemons
+  copy:
+    src: daemons
+    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:
+      - add hostname {{ metal_partition_id }}-{{ inventory_hostname }}
+    commit: true

roles/cumulus/tasks/switch_plane.yaml

@@ -0,0 +1,14 @@
+---
+- name: render ports.conf
+  template:
+    src: ports.conf.j2
+    dest: /etc/cumulus/ports.conf
+  notify: restart switchd
+
+- name: enable static route leak to apply hardware support
+  replace:
+    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