Merge pull request #15 from stackhpc/upstream/xena-2022-06-20

Synchronise xena with upstream

Author: markgoddard

ansible/group_vars/all/apt

@@ -10,3 +10,38 @@ apt_proxy_http:
 
 # Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}.
 apt_proxy_https: "{{ apt_proxy_http }}"
+
+# List of Apt configuration options. Each item is a dict with the following
+# keys:
+# * content: free-form configuration file content
+# * filename: name of a file in /etc/apt/apt.conf.d/ in which to write the
+#   configuration
+# Default is an empty list.
+apt_config: []
+
+# List of apt keys. Each item is a dict containing the following keys:
+# * url: URL of key
+# * filename: Name of a file in which to store the downloaded key. The
+#   extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise.
+# Default is an empty list.
+apt_keys: []
+
+# A list of Apt repositories. Each item is a dict with the following keys:
+# * types: whitespace-separated list of repository types, e.g. deb or deb-src
+#   (optional, default is 'deb')
+# * url: URL of the repository
+# * suites: whitespace-separated list of suites, e.g. focal (optional, default
+#   is ansible_facts.distribution_release)
+# * components: whitespace-separated list of components, e.g. main (optional,
+#   default is 'main')
+# * signed_by: whitespace-separated list of names of GPG keyring files in
+#   apt_keys_path (optional, default is unset)
+# * architecture: whitespace-separated list of architectures that will be used
+#   (optional, default is unset)
+# Default is an empty list.
+apt_repositories: []
+
+# Whether to disable repositories in /etc/apt/sources.list. This may be used
+# when replacing the distribution repositories via apt_repositories.
+# Default is false.
+apt_disable_sources_list: false

ansible/group_vars/all/dnf

@@ -7,12 +7,18 @@ dnf_config: {}
 # Whether or not to use a local Yum mirror. Default value is 'false'.
 dnf_use_local_mirror: false
 
-# Mirror FQDN for Yum repos. Default value is 'mirror.centos.org'.
+# Mirror FQDN for Yum CentOS repos. Default value is 'mirror.centos.org'.
 dnf_centos_mirror_host: 'mirror.centos.org'
 
 # Mirror directory for Yum CentOS repos. Default value is 'centos'.
 dnf_centos_mirror_directory: 'centos'
 
+# Mirror FQDN for Yum Rocky repos. Default value is 'dl.rockylinux.org'.
+dnf_rocky_mirror_host: 'dl.rockylinux.org'
+
+# Mirror directory for Yum Rocky repos. Default value is 'pub/rocky'.
+dnf_rocky_mirror_directory: 'pub/rocky'
+
 # Mirror FQDN for Yum EPEL repos. Default value is
 # 'download.fedoraproject.org'.
 dnf_epel_mirror_host: 'download.fedoraproject.org'

ansible/group_vars/all/globals

@@ -44,13 +44,17 @@ kayobe_ansible_user: "stack"
 ###############################################################################
 # OS distribution.
 
-# OS distribution name. Valid options are "centos", "ubuntu". Default is
-# "centos".
+# OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
+# is "centos".
 os_distribution: "centos"
 
 # OS release. Valid options are "8-stream" when os_distribution is "centos", or
-# "focal" when os_distribution is "ubuntu".
-os_release: "{{ '8-stream' if os_distribution == 'centos' else 'focal' }}"
+# "8" when os_distribution is "rocky", or "focal" when os_distribution is
+# "ubuntu".
+os_release: >-
+  {{ '8-stream' if os_distribution == 'centos'
+  else '8' if os_distribution == 'rocky'
+  else 'focal' }}
 
 ###############################################################################
 # Ansible configuration.

ansible/group_vars/all/infra-vms

@@ -43,11 +43,16 @@ infra_vm_root_format: qcow2
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
+# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# when os_distribution is "rocky",
+# or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
 # otherwise.
 infra_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
+  {%- elif os_distribution == 'rocky' %}
+  http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
   {%- else -%}
   https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2
   {%- endif %}

ansible/group_vars/all/kolla

@@ -53,8 +53,9 @@ kolla_node_custom_config_path: "{{ kolla_config_path }}/config"
 # Kolla configuration.
 
 # Kolla base container image distribution. Options are "centos", "debian",
-# "ubuntu". Default is {{ os_distribution }}.
-kolla_base_distro: "{{ os_distribution }}"
+# "ubuntu". Default is
+# {{ 'centos' if os_distribution == 'rocky' else os_distribution }}.
+kolla_base_distro: "{{ 'centos' if os_distribution == 'rocky' else os_distribution }}"
 
 # Kolla container image type: binary or source.
 kolla_install_type: "source"
@@ -154,6 +155,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_gnocchi | bool }}"
   - regex: ^grafana
     enabled: "{{ kolla_enable_grafana | bool }}"
+  - regex: ^hacluster
+    enabled: "{{ kolla_enable_hacluster | bool }}"
   - regex: ^haproxy$
     enabled: "{{ kolla_enable_haproxy | bool }}"
   - regex: ^heat
@@ -201,7 +204,7 @@ overcloud_container_image_regex_map:
   - regex: neutron-server
     enabled: "{{ kolla_enable_neutron | bool }}"
   # Neutron SFC agent not currently supported on CentOS binary builds.
-  - regex: "neutron-\\(dhcp\\|l3\\|metadata\\|openvswitch\\)-agent"
+  - regex: "neutron-\\(dhcp\\|l3\\|metadata\\|linuxbridge\\|openvswitch\\)-agent"
     enabled: "{{ kolla_enable_neutron | bool }}"
   - regex: neutron-mlnx-agent
     enabled: "{{ kolla_enable_neutron_mlnx | bool }}"
@@ -534,6 +537,7 @@ kolla_enable_fluentd: "yes"
 kolla_enable_freezer: "no"
 kolla_enable_gnocchi: "no"
 kolla_enable_grafana: "{{ kolla_enable_monasca | bool }}"
+kolla_enable_hacluster: "no"
 kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitty | bool }}"

ansible/group_vars/all/seed-vm

@@ -42,12 +42,17 @@ seed_vm_root_format: qcow2
 
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu", or
+# when os_distribution is "ubuntu",
+# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# when os_distribution is "rocky",
+# or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
 # otherwise.
 seed_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
+  {%- elif os_distribution == 'rocky' %}
+  http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
   {%- else -%}
   https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2
   {%- endif %}

ansible/host-package-update.yml

@@ -8,9 +8,9 @@
     host_package_update_security: false
   tasks:
     - name: Update host packages
-      dnf:
+      package:
         name: "{{ host_package_update_packages }}"
-        security: "{{ host_package_update_security | bool }}"
+        security: "{{ host_package_update_security | bool if ansible_facts.os_family == 'RedHat' else omit }}"
         state: latest
-      when: ansible_facts.os_family == 'RedHat'
+        update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}"
       become: true

ansible/ip-allocation.yml

@@ -27,6 +27,7 @@
       when:
         - item | net_cidr != None
         - item | net_bootproto != 'dhcp'
+        - not item | net_no_ip | bool
   roles:
     - role: ip-allocation
       ip_allocation_filename: "{{ kayobe_env_config_path }}/network-allocation.yml"

ansible/kolla-bifrost.yml

@@ -9,6 +9,7 @@
       # Network configuration.
       kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}"
       kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}"
+      kolla_bifrost_dhcp_pool_mask: "{{ provision_oc_net_name | net_mask }}"
       kolla_bifrost_dnsmasq_router: "{{ provision_oc_net_name | net_inspection_gateway or provision_oc_net_name | net_gateway }}"
       kolla_bifrost_dnsmasq_dns_servers: "{{ resolv_nameservers | default([]) }}"
       kolla_bifrost_domain: "{{ resolv_domain | default }}"

ansible/provision-net.yml

@@ -18,6 +18,7 @@
     venv: "{{ virtualenv_path }}/openstacksdk"
     provision_net:
       name: "{{ kolla_ironic_provisioning_network }}"
+      mtu: "{{ provision_wl_net_name | net_mtu | default(omit, True) }}"
       provider_network_type: "{% if provision_wl_net_name | net_vlan %}vlan{% else %}flat{% endif %}"
       provider_physical_network: "{{ provision_wl_net_name | net_physical_network | default('physnet1', True) }}"
       provider_segmentation_id: "{{ provision_wl_net_name | net_vlan }}"
@@ -31,6 +32,7 @@
           allocation_pool_end: "{{ provision_wl_net_name | net_neutron_allocation_pool_end }}"
     cleaning_net:
       name: "{{ kolla_ironic_cleaning_network }}"
+      mtu: "{{ cleaning_net_name | net_mtu | default(omit, True) }}"
       provider_network_type: "{% if cleaning_net_name | net_vlan %}vlan{% else %}flat{% endif %}"
       provider_physical_network: "{{ cleaning_net_name | net_physical_network | default('physnet1', True) }}"
       provider_segmentation_id: "{{ cleaning_net_name | net_vlan }}"
@@ -64,7 +66,7 @@
     - role: stackhpc.os-networks
       os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
       os_openstacksdk_state: latest
-      os_openstacksdk_upper_constraints_file: "{{ pip_upper_constraints_file }}"
+      os_networks_upper_constraints_file: "{{ pip_upper_constraints_file }}"
       os_networks_venv: "{{ venv }}"
       os_networks_auth_type: "{{ openstack_auth_type }}"
       os_networks_auth: "{{ openstack_auth }}"