From eda92e7018dd85f5b343bfda3cb3f8bdb85751c4 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Wed, 23 Nov 2022 15:21:48 +0000 Subject: [PATCH 01/14] feat: use pulp proxy --- etc/kayobe/ansible/fix-networking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/fix-networking.yml b/etc/kayobe/ansible/fix-networking.yml index f24be3862..9db494214 100644 --- a/etc/kayobe/ansible/fix-networking.yml +++ b/etc/kayobe/ansible/fix-networking.yml @@ -16,6 +16,6 @@ 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 + 10.209.0.207 pulp-server pulp-server.internal.sms-cloud dest: /etc/hosts become: true From e1bcaa4902ca3707316756a7451533ab0fe28504 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Wed, 23 Nov 2022 15:22:50 +0000 Subject: [PATCH 02/14] feat: remove default from `vxlan_vni` Maybe the VXLAN role could assert required values are provided. --- .../ci-multinode/inventory/group_vars/all/vxlan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/inventory/group_vars/all/vxlan.yml b/etc/kayobe/environments/ci-multinode/inventory/group_vars/all/vxlan.yml index 0e8983859..808c78034 100644 --- a/etc/kayobe/environments/ci-multinode/inventory/group_vars/all/vxlan.yml +++ b/etc/kayobe/environments/ci-multinode/inventory/group_vars/all/vxlan.yml @@ -10,7 +10,7 @@ vxlan_phys_dev: "{{ admin_oc_interface }}" vxlan_dstport: 4790 # Virtual network identifier used by the VLXAN. This must be unique between multinode environments. -vxlan_vni: 10 +vxlan_vni: # This is a dictionary of interfaces to be created by the stackhpc.vxlan role. vxlan_interfaces: From 7393221d906262a342c7c2c8c0113e3397218cfb Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Wed, 23 Nov 2022 15:24:04 +0000 Subject: [PATCH 03/14] feat: change bootstrap_user for all groups --- etc/kayobe/environments/ci-multinode/compute.yml | 1 + etc/kayobe/environments/ci-multinode/controllers.yml | 1 + etc/kayobe/environments/ci-multinode/seed.yml | 1 + etc/kayobe/environments/ci-multinode/storage.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/etc/kayobe/environments/ci-multinode/compute.yml b/etc/kayobe/environments/ci-multinode/compute.yml index 74e7ef86c..7e7701cf0 100644 --- a/etc/kayobe/environments/ci-multinode/compute.yml +++ b/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: diff --git a/etc/kayobe/environments/ci-multinode/controllers.yml b/etc/kayobe/environments/ci-multinode/controllers.yml index 3f612ecd8..73c31c27f 100644 --- a/etc/kayobe/environments/ci-multinode/controllers.yml +++ b/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: diff --git a/etc/kayobe/environments/ci-multinode/seed.yml b/etc/kayobe/environments/ci-multinode/seed.yml index f05d93557..1ae71f1a4 100644 --- a/etc/kayobe/environments/ci-multinode/seed.yml +++ b/etc/kayobe/environments/ci-multinode/seed.yml @@ -1,4 +1,5 @@ --- +seed_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}" seed_lvm_groups: - "{{ stackhpc_lvm_group_rootvg }}" diff --git a/etc/kayobe/environments/ci-multinode/storage.yml b/etc/kayobe/environments/ci-multinode/storage.yml index 44b655ce7..b152af472 100644 --- a/etc/kayobe/environments/ci-multinode/storage.yml +++ b/etc/kayobe/environments/ci-multinode/storage.yml @@ -1,4 +1,5 @@ --- +storage_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}" # List of storage volume groups. See mrlesmithjr.manage-lvm role for # format. storage_lvm_groups: From b808807b671a6fe88e5d487c0991f77cbe1aca74 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Wed, 23 Nov 2022 15:27:03 +0000 Subject: [PATCH 04/14] feat: expand `growroot-group` to include seed --- etc/kayobe/environments/ci-multinode/growroot.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 etc/kayobe/environments/ci-multinode/growroot.yml diff --git a/etc/kayobe/environments/ci-multinode/growroot.yml b/etc/kayobe/environments/ci-multinode/growroot.yml new file mode 100644 index 000000000..1a0c767ac --- /dev/null +++ b/etc/kayobe/environments/ci-multinode/growroot.yml @@ -0,0 +1,2 @@ +--- +growroot_group: "seed:overcloud" From 946f9eb6800845beac9ce42da1f3e5b0328fbe7b Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Wed, 23 Nov 2022 22:12:38 +0000 Subject: [PATCH 05/14] feat: enable ovn --- etc/kayobe/environments/ci-multinode/kolla.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/environments/ci-multinode/kolla.yml b/etc/kayobe/environments/ci-multinode/kolla.yml index 5d143c5da..1b7d8b4b4 100644 --- a/etc/kayobe/environments/ci-multinode/kolla.yml +++ b/etc/kayobe/environments/ci-multinode/kolla.yml @@ -2,3 +2,4 @@ kolla_enable_cinder: true kolla_enable_cinder_backup: true kolla_enable_neutron_provider_networks: true +kolla_enable_ovn: true \ No newline at end of file From 92c886b93543dd9c25d16b3680bbf97067d7653f Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Wed, 23 Nov 2022 22:14:43 +0000 Subject: [PATCH 06/14] feat: enable `Octavia` backed by `OVN` --- etc/kayobe/environments/ci-multinode/kolla.yml | 3 ++- etc/kayobe/environments/ci-multinode/kolla/globals.yml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/kolla.yml b/etc/kayobe/environments/ci-multinode/kolla.yml index 1b7d8b4b4..56e1a7af4 100644 --- a/etc/kayobe/environments/ci-multinode/kolla.yml +++ b/etc/kayobe/environments/ci-multinode/kolla.yml @@ -2,4 +2,5 @@ kolla_enable_cinder: true kolla_enable_cinder_backup: true kolla_enable_neutron_provider_networks: true -kolla_enable_ovn: true \ No newline at end of file +kolla_enable_ovn: true +kolla_enable_octavia: true \ No newline at end of file diff --git a/etc/kayobe/environments/ci-multinode/kolla/globals.yml b/etc/kayobe/environments/ci-multinode/kolla/globals.yml index 60ec061af..8ccd7608d 100644 --- a/etc/kayobe/environments/ci-multinode/kolla/globals.yml +++ b/etc/kayobe/environments/ci-multinode/kolla/globals.yml @@ -14,3 +14,8 @@ nova_backend_ceph: "yes" # list, and add the config that would be generated from it here. neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs" neutron_external_interface: "{{ vxlan_interfaces[0].device }}" + +# Octavia load balancer configuration +octavia_auto_configure: "no" +octavia_provider_drivers: "ovn:OVN provider" +octavia_provider_agents: "ovn" \ No newline at end of file From 8db5d805e150500d84a7b146a4ed2673999a529b Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Wed, 23 Nov 2022 22:17:59 +0000 Subject: [PATCH 07/14] feat: bump stackhpc.cephadm `1.8.0` ~> `1.10.0` --- etc/kayobe/ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml index aab4877f5..6009e0e21 100644 --- a/etc/kayobe/ansible/requirements.yml +++ b/etc/kayobe/ansible/requirements.yml @@ -5,6 +5,6 @@ collections: - name: pulp.squeezer version: 0.0.11 - name: stackhpc.cephadm - version: 1.8.0 + version: 1.10.0 roles: - src: stackhpc.vxlan From 7b12c587e3e37b12e92c59f465aa6312de3b11f2 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Thu, 24 Nov 2022 11:39:52 +0000 Subject: [PATCH 08/14] fix: reduce mtu of external network down 1350 This reduction is required as VMs placed on the `admin-vxlan` network cannot be accessed. --- etc/kayobe/environments/ci-multinode/networks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/networks.yml b/etc/kayobe/environments/ci-multinode/networks.yml index a52c933e8..86406bfad 100644 --- a/etc/kayobe/environments/ci-multinode/networks.yml +++ b/etc/kayobe/environments/ci-multinode/networks.yml @@ -81,7 +81,7 @@ internal_vlan: 101 # External network external_cidr: 192.168.38.0/24 -external_mtu: 1400 +external_mtu: 1350 external_allocation_pool_start: 192.168.38.3 external_allocation_pool_end: 192.168.38.128 external_vlan: 102 From fd5febf7dec0304402ab4303690f248b3770824e Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Thu, 24 Nov 2022 14:46:13 +0000 Subject: [PATCH 09/14] fix: add missing new line --- etc/kayobe/environments/ci-multinode/kolla/globals.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/kolla/globals.yml b/etc/kayobe/environments/ci-multinode/kolla/globals.yml index 8ccd7608d..ee5c05ede 100644 --- a/etc/kayobe/environments/ci-multinode/kolla/globals.yml +++ b/etc/kayobe/environments/ci-multinode/kolla/globals.yml @@ -18,4 +18,5 @@ neutron_external_interface: "{{ vxlan_interfaces[0].device }}" # Octavia load balancer configuration octavia_auto_configure: "no" octavia_provider_drivers: "ovn:OVN provider" -octavia_provider_agents: "ovn" \ No newline at end of file +octavia_provider_agents: "ovn" + From 6d9310ceab46c9c1d3afcce2271b6a8d5418c117 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Thu, 24 Nov 2022 15:00:19 +0000 Subject: [PATCH 10/14] fix: remove excess new line --- etc/kayobe/environments/ci-multinode/kolla/globals.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/kolla/globals.yml b/etc/kayobe/environments/ci-multinode/kolla/globals.yml index ee5c05ede..8d020e349 100644 --- a/etc/kayobe/environments/ci-multinode/kolla/globals.yml +++ b/etc/kayobe/environments/ci-multinode/kolla/globals.yml @@ -19,4 +19,3 @@ neutron_external_interface: "{{ vxlan_interfaces[0].device }}" octavia_auto_configure: "no" octavia_provider_drivers: "ovn:OVN provider" octavia_provider_agents: "ovn" - From a74c3cfe594d0e996943be88af5bb263b19c2bc7 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Thu, 24 Nov 2022 15:06:35 +0000 Subject: [PATCH 11/14] fix: add missing new line to `kolla.yml` --- etc/kayobe/environments/ci-multinode/kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/kolla.yml b/etc/kayobe/environments/ci-multinode/kolla.yml index 56e1a7af4..5c6c80dae 100644 --- a/etc/kayobe/environments/ci-multinode/kolla.yml +++ b/etc/kayobe/environments/ci-multinode/kolla.yml @@ -3,4 +3,4 @@ kolla_enable_cinder: true kolla_enable_cinder_backup: true kolla_enable_neutron_provider_networks: true kolla_enable_ovn: true -kolla_enable_octavia: true \ No newline at end of file +kolla_enable_octavia: true From f3aa38aabd4f0e34c861be8e1a18866b8c6f29b7 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Mon, 6 Feb 2023 11:32:24 +0000 Subject: [PATCH 12/14] fix: use the `pulp-server` and not the proxy --- etc/kayobe/ansible/fix-networking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/fix-networking.yml b/etc/kayobe/ansible/fix-networking.yml index 9db494214..f24be3862 100644 --- a/etc/kayobe/ansible/fix-networking.yml +++ b/etc/kayobe/ansible/fix-networking.yml @@ -16,6 +16,6 @@ 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.209.0.207 pulp-server pulp-server.internal.sms-cloud + 10.205.3.187 pulp-server pulp-server.internal.sms-cloud dest: /etc/hosts become: true From 3d5e3d18c021e5354ce23449ff100fad4e506ac7 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Mon, 6 Feb 2023 12:02:28 +0000 Subject: [PATCH 13/14] feat: reduce concurrency and select `loadlist` --- .automation.conf/config.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.automation.conf/config.sh b/.automation.conf/config.sh index 96e0eba37..e8b88728b 100644 --- a/.automation.conf/config.sh +++ b/.automation.conf/config.sh @@ -3,7 +3,7 @@ # See: https://github.com/stackhpc/docker-rally/blob/master/bin/rally-verify-wrapper.sh for a full list of tempest parameters that can be overriden. # You can override tempest parameters like so: -export TEMPEST_CONCURRENCY=8 +export TEMPEST_CONCURRENCY=2 # Specify single test whilst experimenting #export TEMPEST_PATTERN="${TEMPEST_PATTERN:-tempest.api.compute.servers.test_create_server.ServersTestJSON.test_host_name_is_same_as_server_name}" @@ -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 @@ -28,6 +32,3 @@ fi if [[ -f ${KAYOBE_AUTOMATION_REPO_ROOT}/etc/kolla/public-openrc.sh ]]; then export TEMPEST_OPENRC="$(< ${KAYOBE_AUTOMATION_REPO_ROOT}/etc/kolla/public-openrc.sh)" fi - -export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full -export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=tempest-full From ed78f1627eaa420be41c62e1d4c674f9c0d8d6d2 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Mon, 6 Feb 2023 12:03:13 +0000 Subject: [PATCH 14/14] fix: use `http` over `https` for `dashboard_url` --- .automation.conf/tempest/tempest-ci-multinode.overrides.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.automation.conf/tempest/tempest-ci-multinode.overrides.conf b/.automation.conf/tempest/tempest-ci-multinode.overrides.conf index d8544bee9..da944b991 100644 --- a/.automation.conf/tempest/tempest-ci-multinode.overrides.conf +++ b/.automation.conf/tempest/tempest-ci-multinode.overrides.conf @@ -27,4 +27,4 @@ min_microversion = 3.0 max_microversion = 3.64 [dashboard] -dashboard_url = https://192.168.39.2 +dashboard_url = http://192.168.39.2