Synchronise master with upstream

ansible/inventory/group_vars/all/container-engine

@@ -12,8 +12,9 @@ container_engine_volumes_path: "{{ podman_volumes_path if container_engine == 'p
 ###############################################################################
 # Docker configuration.
 
-# Name of the docker storage driver. Default is 'overlay2'.
-docker_storage_driver: overlay2
+# Name of the docker storage driver. Default is "", which defers to the
+# Docker runtime default.
+docker_storage_driver: ""
 
 # URL of docker registry
 docker_registry:

ansible/inventory/group_vars/all/controllers

@@ -44,7 +44,6 @@ controller_default_network_interfaces: >
       inspection_net_name,
       internal_net_name,
       storage_net_name,
-      swift_storage_net_name,
       cleaning_net_name] | select | unique | list }}
 
 # List of extra networks to which controller nodes are attached.

ansible/inventory/group_vars/all/kolla

@@ -244,8 +244,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_redis | bool }}"
   - regex: ^skyline
     enabled: "{{ kolla_enable_skyline | bool }}"
-  - regex: ^swift
-    enabled: "{{ kolla_enable_swift | bool }}"
   - regex: ^tacker
     enabled: "{{ kolla_enable_tacker | bool }}"
   - regex: ^tgtd
@@ -405,8 +403,6 @@ kolla_overcloud_inventory_pass_through_host_vars_default:
   - "kolla_api_interface"
   - "kolla_storage_interface"
   - "kolla_cluster_interface"
-  - "kolla_swift_storage_interface"
-  - "kolla_swift_replication_interface"
   - "kolla_provision_interface"
   - "kolla_inspector_dnsmasq_interface"
   - "kolla_dns_interface"
@@ -437,8 +433,6 @@ kolla_overcloud_inventory_pass_through_host_vars_map_default:
   kolla_api_interface: "api_interface"
   kolla_storage_interface: "storage_interface"
   kolla_cluster_interface: "cluster_interface"
-  kolla_swift_storage_interface: "swift_storage_interface"
-  kolla_swift_replication_interface: "swift_replication_interface"
   kolla_provision_interface: "provision_interface"
   kolla_inspector_dnsmasq_interface: "ironic_dnsmasq_interface"
   kolla_dns_interface: "dns_interface"
@@ -580,7 +574,6 @@ kolla_enable_prometheus: "no"
 kolla_enable_qdrouterd: "no"
 kolla_enable_redis: "no"
 kolla_enable_skyline: "no"
-kolla_enable_swift: "no"
 kolla_enable_tacker: "no"
 kolla_enable_trove: "no"
 kolla_enable_valkey: "no"

ansible/inventory/group_vars/all/network

@@ -1,12 +1,14 @@
 ---
+# Kayobe network configuration.
+
 ###############################################################################
 # Network role to network name mappings.
 
 # Name of the network used for admin access to the overcloud
 admin_oc_net_name: "{{ provision_oc_net_name }}"
 
-# Name of the network used by the overcloud hosts to manage the bare metal
-# compute hosts via their out-of-band management controllers.
+# Name of the network used by the seed to manage the bare metal overcloud
+# hosts via their out-of-band management controllers.
 oob_oc_net_name: 'oob_oc_net'
 
 # Name of the network used by the seed to provision the bare metal overcloud
@@ -43,12 +45,6 @@ storage_net_name: 'storage_net'
 # Name of the network used to carry storage management traffic.
 storage_mgmt_net_name: 'storage_mgmt_net'
 
-# Name of the network used to carry swift storage data traffic.
-swift_storage_net_name: "{{ storage_net_name }}"
-
-# Name of the network used to carry swift storage replication traffic.
-swift_storage_replication_net_name: "{{ storage_mgmt_net_name }}"
-
 # Name of the network used to perform hardware introspection on the bare metal
 # workload hosts.
 inspection_net_name: "{{ 'inspection_net' if kolla_enable_ironic | bool else None }}"
@@ -58,7 +54,7 @@ inspection_net_name: "{{ 'inspection_net' if kolla_enable_ironic | bool else Non
 cleaning_net_name: "{{ provision_wl_net_name }}"
 
 ###############################################################################
-# Network interface naming conventions.
+# Network virtual patch link configuration.
 
 # Suffix for Open vSwitch bridge names.
 network_bridge_suffix_ovs: '-ovs'

ansible/inventory/group_vars/all/storage

@@ -13,11 +13,7 @@ storage_bootstrap_user: "{{ 'cloud-user' if os_distribution == 'centos' else os_
 # List of networks to which storage nodes are attached.
 storage_network_interfaces: >
   {{ (storage_default_network_interfaces +
-      storage_extra_network_interfaces +
-      ([swift_storage_net_name]
-       if storage_needs_swift_network else []) +
-      ([swift_storage_replication_net_name]
-       if storage_needs_swift_replication_network else [])) | select | unique | list }}
+      storage_extra_network_interfaces) | select | unique | list }}
 
 # List of default networks to which storage nodes are attached.
 storage_default_network_interfaces: >
@@ -29,15 +25,6 @@ storage_default_network_interfaces: >
 # List of extra networks to which storage nodes are attached.
 storage_extra_network_interfaces: []
 
-# Whether this host requires access to Swift networks.
-storage_needs_swift_network: >-
-  {{ kolla_enable_swift | bool and
-     inventory_hostname in query('inventory_hostnames', swift_hosts) }}
-
-storage_needs_swift_replication_network: >-
-  {{ kolla_enable_swift | bool and
-     inventory_hostname in query('inventory_hostnames', swift_hosts) }}
-
 ###############################################################################
 # Storage node BIOS configuration.
 

ansible/kolla-ansible.yml

@@ -204,14 +204,6 @@
             description: "Cluster network"
             network: "{{ storage_mgmt_net_name }}"
             required: False
-          - var_name: "kolla_swift_storage_interface"
-            description: "Swift storage network"
-            network: "{{ swift_storage_net_name }}"
-            required: False
-          - var_name: "kolla_swift_replication_interface"
-            description: "Swift storage replication network"
-            network: "{{ swift_storage_replication_net_name }}"
-            required: False
           - var_name: "kolla_provision_interface"
             description: "Bare metal provisioning network"
             network: "{{ provision_wl_net_name }}"

ansible/overcloud-etc-hosts-fixup.yml

@@ -7,8 +7,19 @@
 # which it is listening. As a workaround, we remove the stale entries from
 # /etc/hosts.  See https://github.com/stackhpc/kayobe/issues/14.
 
-- name: Ensure overcloud hosts' /etc/hosts does not contain incorrect IPs
+- name: Collect hosts to map through to kolla-ansible
   hosts: overcloud
+  gather_facts: false
+  tags:
+    - etc-hosts-fixup
+  tasks:
+    - name: Group by kolla_overcloud_inventory_pass_through_enabled
+      ansible.builtin.group_by:
+        key: "kolla_mapped_overcloud_host_{{ kolla_overcloud_inventory_pass_through_enabled }}"
+      changed_when: false
+
+- name: Ensure overcloud hosts' /etc/hosts does not contain incorrect IPs
+  hosts: kolla_mapped_overcloud_host_True
   max_fail_percentage: >-
     {{ overcloud_etc_hosts_fixup_max_fail_percentage |
        default(kayobe_max_fail_percentage) |
@@ -28,7 +39,7 @@
       become: True
 
 - name: Ensure rabbitmq containers' /etc/hosts does not contain incorrect IPs
-  hosts: overcloud
+  hosts: kolla_mapped_overcloud_host_True
   max_fail_percentage: >-
     {{ overcloud_etc_hosts_fixup_max_fail_percentage |
        default(kayobe_max_fail_percentage) |

ansible/overcloud-host-configure.yml

@@ -31,6 +31,5 @@
 - import_playbook: "kolla-target-venv.yml"
 - import_playbook: "container-engine.yml"
 - import_playbook: "apparmor-libvirt.yml"
-- import_playbook: "swift-block-devices.yml"
 - import_playbook: "compute-libvirt-host.yml"
 - import_playbook: "vgpu.yml"

ansible/physical-network.yml

@@ -28,7 +28,9 @@
     physical_network_display: False
     # List of supported values for the 'switch_type' variable.
     supported_switch_types:
+      - alliedware-plus
       - arista
+      - cisco-nxos
       - dellos6
       - dellos9
       - dellos10
@@ -109,6 +111,22 @@
       debug:
         var: switch_interface_config
 
+- name: Ensure AlliedWare Plus physical switches are configured
+  hosts: switches_of_type_alliedware-plus:&switches_in_display_mode_False
+  gather_facts: no
+  max_fail_percentage: >-
+    {{ physical_network_max_fail_percentage |
+       default(kayobe_max_fail_percentage) |
+       default(100) }}
+  roles:
+    - role: ssh-known-host
+      when: not switch_skip_keyscan | bool
+
+    - role: alliedware-plus-switch
+      alliedware_plus_switch_config: "{{ switch_config }}"
+      alliedware_plus_switch_interface_config: "{{ switch_interface_config }}"
+      alliedware_plus_switch_save: "{{ switch_config_save }}"
+
 - name: Ensure Arista physical switches are configured
   hosts: switches_of_type_arista:&switches_in_display_mode_False
   gather_facts: no
@@ -126,6 +144,22 @@
       arista_switch_config: "{{ switch_config }}"
       arista_switch_interface_config: "{{ switch_interface_config }}"
 
+- name: Ensure Cisco NX-OS physical switches are configured
+  hosts: switches_of_type_cisco-nxos:&switches_in_display_mode_False
+  gather_facts: no
+  max_fail_percentage: >-
+    {{ physical_network_max_fail_percentage |
+       default(kayobe_max_fail_percentage) |
+       default(100) }}
+  roles:
+    - role: ssh-known-host
+      when: not switch_skip_keyscan | bool
+
+    - role: cisco-nxos-switch
+      cisco_nxos_switch_config: "{{ switch_config }}"
+      cisco_nxos_switch_interface_config: "{{ switch_interface_config }}"
+      cisco_nxos_switch_save: "{{ switch_config_save }}"
+
 - name: Ensure DellOS physical switches are configured
   hosts: switches_of_type_dellos6:switches_of_type_dellos9:switches_of_type_dellos10:&switches_in_display_mode_False
   gather_facts: no

ansible/roles/alliedware-plus-switch/README.md

@@ -0,0 +1,79 @@
+AlliedWare Plus Switch
+======================
+
+This role configures AlliedWare Plus switches using the
+`alliedtelesis.awplus.awplus_config` Ansible module. It provides a fairly
+minimal abstraction of the configuration interface provided by the
+`awplus_config` module, allowing for application of arbitrary switch
+configuration options.
+
+Requirements
+------------
+
+The switches should be configured to allow SSH access.
+
+The `alliedtelesis.awplus` Ansible collection must be installed.
+
+Role Variables
+--------------
+
+`alliedware_plus_switch_config` is a list of configuration lines to apply to
+the switch, and defaults to an empty list.
+
+`alliedware_plus_switch_interface_config` contains interface configuration. It
+is a dict mapping switch interface names to configuration dicts, and defaults
+to an empty dict. Each dict may contain the following items:
+
+- `description` - an optional description to apply to the interface.
+- `config` - a list of per-interface configuration commands.
+
+`alliedware_plus_switch_save` controls whether the running configuration is
+saved to the startup configuration when they differ, including any previously
+unsaved changes. Defaults to `false`.
+
+Dependencies
+------------
+
+None
+
+Example Playbook
+----------------
+
+The following playbook configures hosts in the `alliedware-plus-switches`
+group. It assumes host variables for each switch holding the host and SSH
+credentials.
+
+    ---
+    - name: Ensure AlliedWare Plus switches are configured
+      hosts: alliedware-plus-switches
+      gather_facts: no
+      vars:
+        ansible_connection: ansible.netcommon.network_cli
+        ansible_network_os: alliedtelesis.awplus.awplus
+      roles:
+        - role: alliedware-plus-switch
+          alliedware_plus_switch_config:
+            - "vlan database"
+            - " vlan 1000,1001 state enable"
+          alliedware_plus_switch_interface_config:
+            port1.0.1:
+              description: server-1
+              config:
+                - "no shutdown"
+                - "switchport"
+                - "switchport mode trunk"
+                - "switchport trunk native vlan 1000"
+                - "switchport trunk allowed vlan add 1001"
+            port1.0.2:
+              description: server-2
+              config:
+                - "no shutdown"
+                - "switchport"
+                - "switchport mode trunk"
+                - "switchport trunk native vlan 1000"
+                - "switchport trunk allowed vlan add 1001"
+
+Author Information
+------------------
+
+- Pierre Riteau (<pierre@stackhpc.com>)

ansible/roles/alliedware-plus-switch/defaults/main.yml

@@ -0,0 +1,11 @@
+---
+# List of configuration lines to apply to the switch.
+alliedware_plus_switch_config: []
+
+# Interface configuration. Dict mapping switch interface names to configuration
+# dicts. Each dict contains an optional 'description' item and a 'config' item
+# which should contain a list of per-interface configuration.
+alliedware_plus_switch_interface_config: {}
+
+# Whether to save the configuration.
+alliedware_plus_switch_save: false

ansible/roles/alliedware-plus-switch/tasks/main.yml

@@ -0,0 +1,6 @@
+---
+- name: Ensure AlliedWare Plus switches are configured
+  alliedtelesis.awplus.awplus_config:
+    lines: "{{ lookup('template', 'alliedware-plus-config.j2') }}"
+    save_when: >-
+      {{ alliedware_plus_switch_save | bool | ternary('modified', 'never') }}