yoga: xena merge

.automation.conf/config.sh

@@ -19,6 +19,10 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then
     # Seem to get servers failing to spawn with higher concurrency
     export TEMPEST_CONCURRENCY=1
   fi
+  if [[ "$KAYOBE_ENVIRONMENT" =~ "ci-multinode" ]]; then
+      export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
+      export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode
+  fi
 fi
 
 if [[ -z "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES:+x}" ]] || [[ ! -e "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES}" ]]; then

.automation.conf/tempest/skip-lists/ci-multinode

@@ -0,0 +1 @@
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details.*: "Cirros image doesn't have '/var/run/udhcpc.eth0.pid"

.automation.conf/tempest/tempest-ci-multinode.overrides.conf

@@ -0,0 +1,30 @@
+[DEFAULT]
+openstack_client_http_timeout = 300
+
+[auth]
+compute_quotas = cores:-1,ram:-1
+
+[identity]
+v3_endpoint_type = publicURL
+
+[compute]
+min_compute_nodes = 2
+min_microversion = 2.1
+max_microversion = 2.88
+
+[service-clients]
+http_timeout = 600
+
+[compute-feature-enabled]
+resize = true
+live_migration = true
+block_migration_for_live_migration = false
+volume_backed_live_migration = true
+console_output = true
+
+[volume]
+min_microversion = 3.0
+max_microversion = 3.66
+
+[dashboard]
+dashboard_url = http://192.168.39.2

etc/kayobe/ansible.cfg

@@ -6,6 +6,8 @@ stdout_callback = yaml
 bin_ansible_callbacks = True
 # Disable fact variable injection to improve performance.
 inject_facts_as_vars = False
+# Add timing information to output
+callback_whitelist = ansible.posix.profile_tasks
 
 [ssh_connection]
 pipelining = True

etc/kayobe/ansible/configure-vxlan.yml

@@ -1,6 +1,6 @@
 ---
 - name: Configure VXLAN
-  hosts: storage,seed,controllers,compute
+  hosts: controllers,compute,seed,storage
   gather_facts: false
   vars:
     ansible_user: "{{ bootstrap_user }}"
@@ -11,10 +11,3 @@
     ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
   roles:
     - role: stackhpc.vxlan
-      vars:
-        vxlan_phys_dev: "{{ admin_oc_net_name | net_interface }}"
-        vxlan_dstport: 4790
-        vxlan_interfaces:
-          - device: vxlan10
-            group: 224.0.0.10
-            bridge: breth1

etc/kayobe/ansible/fix-hostname.yml

@@ -0,0 +1,23 @@
+---
+- name: Fix hostname on storage nodes for cephadm
+  hosts: storage
+  gather_facts: false
+  vars:
+    ansible_user: "{{ bootstrap_user }}"
+    # We can't assume that a virtualenv exists at this point, so use the system
+    # python interpreter.
+    ansible_python_interpreter: /usr/bin/python3
+    # Work around no known_hosts entry on first boot.
+    ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
+  tasks:
+    - name: Get current hostname
+      ansible.builtin.command:
+        cmd: hostname
+      changed_when: false
+      register: current_hostname
+
+    - name: Set hostname to a non FQDN
+      ansible.builtin.command:
+        cmd: hostnamectl set-hostname "{{ inventory_hostname }}"
+      when: current_hostname.stdout != inventory_hostname
+      become: true

etc/kayobe/ansible/fix-networking.yml

@@ -0,0 +1,21 @@
+---
+- name: Fix networking
+  hosts: seed,compute,controllers,storage
+  gather_facts: false
+  vars:
+    ansible_user: "{{ bootstrap_user }}"
+    # We can't assume that a virtualenv exists at this point, so use the system
+    # python interpreter.
+    ansible_python_interpreter: /usr/bin/python3
+    # Work around no known_hosts entry on first boot.
+    ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
+  tasks:
+    - name: Ensure `hosts` file contains pulp entries
+      ansible.builtin.copy:
+        content: |
+          127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+          ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+          10.0.0.34 pelican pelican.service.compute.sms-lab.cloud
+          10.205.3.187 pulp-server pulp-server.internal.sms-cloud
+        dest: /etc/hosts
+      become: true

etc/kayobe/ansible/growroot.yml

@@ -34,6 +34,7 @@
         cmd: type growpart
       changed_when: false
       failed_when: false
+      check_mode: false
       register: growpart_check
       become: true
 
@@ -51,6 +52,7 @@
       register: pvs
       become: True
       changed_when: False
+      check_mode: false
 
     - name: Fail if root PV device not found
       fail:

etc/kayobe/ansible/requirements.yml

@@ -1,7 +1,7 @@
 ---
 collections:
   - name: stackhpc.cephadm
-    version: 1.10.0
+    version: 1.12.2
   - name: stackhpc.pulp
     version: 0.4.1
 roles:

etc/kayobe/containers/pulp/pre.yml

@@ -19,3 +19,24 @@
     dest: /opt/kayobe/containers/pulp/settings.py
     mode: 0644
   become: true
+
+- name: Configure TLS for local Pulp
+  when: pulp_enable_tls | bool
+  become: true
+  block:
+    - name: Ensure /opt/kayobe/containers/pulp/certs exists
+      file:
+        path: "/opt/kayobe/containers/pulp/certs"
+        state: directory
+
+    - name: Copy TLS cert and key into container directory
+      template:
+        src: "{{ item.src }}"
+        dest: "/opt/kayobe/containers/pulp/certs/{{ item.dest }}"
+        mode: 0644
+      become: true
+      loop:
+        - src: "{{ pulp_cert_path }}"
+          dest: 'pulp_webserver.crt'
+        - src: "{{ pulp_key_path }}"
+          dest: 'pulp_webserver.key'

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -12,6 +12,7 @@ kolla_enable_cinder: true
 kolla_enable_cloudkitty: true
 kolla_enable_designate: true
 kolla_enable_elasticsearch_curator: true
+kolla_enable_etcd: true
 kolla_enable_grafana: true
 kolla_enable_influxdb: true
 kolla_enable_ironic: true

etc/kayobe/environments/ci-multinode/compute.yml

@@ -1,4 +1,5 @@
 ---
+compute_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
 # List of storage volume groups. See mrlesmithjr.manage-lvm role for
 # format.
 compute_lvm_groups:

etc/kayobe/environments/ci-multinode/controllers.yml

@@ -1,4 +1,5 @@
 ---
+controller_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
 # List of storage volume groups. See mrlesmithjr.manage-lvm role for
 # format.
 controller_lvm_groups:

etc/kayobe/environments/ci-multinode/growroot.yml

@@ -0,0 +1,2 @@
+---
+growroot_group: "seed:overcloud"

etc/kayobe/environments/ci-multinode/inventory/group_vars/all/main.yml

@@ -0,0 +1,2 @@
+---
+cephadm_host_labels: []

etc/kayobe/environments/ci-multinode/inventory/group_vars/all/vxlan.yml

@@ -0,0 +1,18 @@
+---
+###############################################################################
+# VXLAN configuration.
+
+# These variables are used by stackhpc.vxlan to construct a VXLAN interface.
+# The physical device that the VXLAN is plugged into.
+vxlan_phys_dev: "{{ admin_oc_interface }}"
+
+# Destination port used by the VXLAN interface. Note: OpenStack uses 4789.
+vxlan_dstport: 4790
+
+# Virtual network identifier used by the VLXAN. This must be unique between multinode environments.
+vxlan_vni:
+
+# This is a dictionary of interfaces to be created by the stackhpc.vxlan role.
+vxlan_interfaces:
+  - device: "vxlan{{ vxlan_vni }}"
+    group: "{{ '239.0.0.0/8' | next_nth_usable(vxlan_vni) }}"

etc/kayobe/environments/ci-multinode/inventory/group_vars/compute/lvm.yml

@@ -0,0 +1,34 @@
+---
+# List of extra LVs to include in the rootvg VG.
+stackhpc_lvm_group_rootvg_lvs_extra:
+  - "{{ stackhpc_lvm_lv_docker }}"
+
+###############################################################################
+# StackHPC LVM Logical Volume (LV) configuration.
+
+# StackHPC LVM lv_swap LV size.
+stackhpc_lvm_lv_swap_size: 1g
+
+# StackHPC LVM lv_root LV size.
+stackhpc_lvm_lv_root_size: 10g
+
+# StackHPC LVM lv_tmp LV size.
+stackhpc_lvm_lv_tmp_size: 10g
+
+# StackHPC LVM lv_var LV size.
+stackhpc_lvm_lv_var_size: 20g
+
+# StackHPC LVM lv_var_tmp LV size.
+stackhpc_lvm_lv_var_tmp_size: 5g
+
+# StackHPC LVM lv_log LV size.
+stackhpc_lvm_lv_log_size: 10g
+
+# StackHPC LVM lv_audit LV size.
+stackhpc_lvm_lv_audit_size: 5g
+
+# StackHPC LVM lv_home LV size.
+stackhpc_lvm_lv_home_size: 5g
+
+# StackHPC LVM lv_docker LV size.
+stackhpc_lvm_lv_docker_size: 75%FREE

etc/kayobe/environments/ci-multinode/inventory/group_vars/compute/network-interfaces

@@ -1,13 +1,14 @@
 ---
 ###############################################################################
-# Network interface definitions for the controller group.
+# Network interface definitions for the compute group.
 
-admin_interface: eno1
+admin_oc_interface: "eno1"
 
-# Controller interface on all-in-one network.
-aio_interface: breth1
-# Use dummy1 if it exists, otherwise the bridge will have no ports.
-aio_bridge_ports: []
+internal_interface: "{{ vxlan_interfaces[0].device }}.{{ internal_vlan }}"
+
+storage_interface: "{{ vxlan_interfaces[0].device }}.{{ storage_vlan }}"
+
+tunnel_interface: "{{ vxlan_interfaces[0].device }}.{{ tunnel_vlan }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/lvm.yml

@@ -0,0 +1,34 @@
+---
+# List of extra LVs to include in the rootvg VG.
+stackhpc_lvm_group_rootvg_lvs_extra:
+  - "{{ stackhpc_lvm_lv_docker }}"
+
+###############################################################################
+# StackHPC LVM Logical Volume (LV) configuration.
+
+# StackHPC LVM lv_swap LV size.
+stackhpc_lvm_lv_swap_size: 1g
+
+# StackHPC LVM lv_root LV size.
+stackhpc_lvm_lv_root_size: 10g
+
+# StackHPC LVM lv_tmp LV size.
+stackhpc_lvm_lv_tmp_size: 10g
+
+# StackHPC LVM lv_var LV size.
+stackhpc_lvm_lv_var_size: 20g
+
+# StackHPC LVM lv_var_tmp LV size.
+stackhpc_lvm_lv_var_tmp_size: 5g
+
+# StackHPC LVM lv_log LV size.
+stackhpc_lvm_lv_log_size: 10g
+
+# StackHPC LVM lv_audit LV size.
+stackhpc_lvm_lv_audit_size: 5g
+
+# StackHPC LVM lv_home LV size.
+stackhpc_lvm_lv_home_size: 5g
+
+# StackHPC LVM lv_docker LV size.
+stackhpc_lvm_lv_docker_size: 75%FREE

etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces

@@ -2,12 +2,15 @@
 ###############################################################################
 # Network interface definitions for the controller group.
 
-admin_interface: eno1
+admin_oc_interface: "eno1"
 
-# Controller interface on all-in-one network.
-aio_interface: breth1
-# Use dummy1 if it exists, otherwise the bridge will have no ports.
-aio_bridge_ports: []
+internal_interface: "{{ vxlan_interfaces[0].device }}.{{ internal_vlan }}"
+
+storage_interface: "{{ vxlan_interfaces[0].device }}.{{ storage_vlan }}"
+
+tunnel_interface: "{{ vxlan_interfaces[0].device }}.{{ tunnel_vlan }}"
+
+public_interface: "{{ vxlan_interfaces[0].device }}.{{ public_vlan }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/lvm.yml

@@ -0,0 +1,34 @@
+---
+# List of extra LVs to include in the rootvg VG.
+stackhpc_lvm_group_rootvg_lvs_extra:
+  - "{{ stackhpc_lvm_lv_docker }}"
+
+###############################################################################
+# StackHPC LVM Logical Volume (LV) configuration.
+
+# StackHPC LVM lv_swap LV size.
+stackhpc_lvm_lv_swap_size: 1g
+
+# StackHPC LVM lv_root LV size.
+stackhpc_lvm_lv_root_size: 10g
+
+# StackHPC LVM lv_tmp LV size.
+stackhpc_lvm_lv_tmp_size: 10g
+
+# StackHPC LVM lv_var LV size.
+stackhpc_lvm_lv_var_size: 20g
+
+# StackHPC LVM lv_var_tmp LV size.
+stackhpc_lvm_lv_var_tmp_size: 5g
+
+# StackHPC LVM lv_log LV size.
+stackhpc_lvm_lv_log_size: 10g
+
+# StackHPC LVM lv_audit LV size.
+stackhpc_lvm_lv_audit_size: 5g
+
+# StackHPC LVM lv_home LV size.
+stackhpc_lvm_lv_home_size: 5g
+
+# StackHPC LVM lv_docker LV size.
+stackhpc_lvm_lv_docker_size: 75%FREE

etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/network-interfaces

@@ -1,13 +1,15 @@
 ---
 ###############################################################################
-# Network interface definitions for the controller group.
+# Network interface definitions for the seed group.
 
-admin_interface: eth0
+admin_oc_interface: "{{ 'ens2' if os_distribution == 'ubuntu' else 'ens3' }}"
+
+provision_oc_interface: "{{ vxlan_interfaces[0].device}}.{{ provision_oc_vlan }}"
+
+external_interface: "{{ vxlan_interfaces[0].device }}.{{ external_vlan }}"
+
+public_interface: "{{ vxlan_interfaces[0].device }}.{{ public_vlan }}"
 
-# Controller interface on all-in-one network.
-aio_interface: breth1
-# Use dummy1 if it exists, otherwise the bridge will have no ports.
-aio_bridge_ports: []
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes