From cbb1a6754dc04df486e9601400e9436e4502b9d7 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 21 Oct 2021 14:49:40 +0100 Subject: [PATCH] 21.10 - Release Remove the "channel: candidate" from the func-test bundles. Change-Id: I2ab757cbe12d7ee758665cff567c3966bb9d22fb --- src/tests/bundles/bionic-queens-ha.yaml | 12 ---------- src/tests/bundles/focal-ussuri-ha.yaml | 23 ------------------- src/tests/bundles/focal-victoria-ha.yaml | 23 ------------------- src/tests/bundles/focal-wallaby-ha.yaml | 23 ------------------- src/tests/bundles/groovy-victoria-ha.yaml | 23 ------------------- src/tests/bundles/hirsute-wallaby-ha.yaml | 23 ------------------- src/tests/bundles/overlays/bionic-ha.yaml.j2 | 2 -- .../bundles/overlays/bionic-queens-ha.yaml.j2 | 2 -- .../overlays/bionic-queens-smoke-ha.yaml.j2 | 2 -- 9 files changed, 133 deletions(-) diff --git a/src/tests/bundles/bionic-queens-ha.yaml b/src/tests/bundles/bionic-queens-ha.yaml index faed0f5..2fd75cf 100644 --- a/src/tests/bundles/bionic-queens-ha.yaml +++ b/src/tests/bundles/bionic-queens-ha.yaml @@ -92,17 +92,14 @@ services: options: block-device: None glance-api-version: 2 - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: token-provider: 'fernet' - channel: candidate mysql: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -110,30 +107,25 @@ services: options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -142,22 +134,18 @@ services: enable-live-migration: true enable-resize: true migration-auth-type: ssh - channel: candidate ntp: charm: cs:ntp num_units: 0 openstack-dashboard: charm: cs:~openstack-charmers/openstack-dashboard num_units: 1 - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate vault: num_units: 1 charm: cs:~openstack-charmers/vault - channel: candidate keystone-saml-mellon1: series: bionic charm: ../../../keystone-saml-mellon diff --git a/src/tests/bundles/focal-ussuri-ha.yaml b/src/tests/bundles/focal-ussuri-ha.yaml index 50e1d22..1964047 100644 --- a/src/tests/bundles/focal-ussuri-ha.yaml +++ b/src/tests/bundles/focal-ussuri-ha.yaml @@ -33,28 +33,20 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate openstack-dashboard-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate cinder-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -65,7 +57,6 @@ applications: - '0' - '1' - '2' - channel: candidate cinder: num_units: 1 @@ -76,7 +67,6 @@ applications: block-device: None to: - '3' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +75,6 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -97,7 +86,6 @@ applications: - '5' - '6' - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -109,7 +97,6 @@ applications: neutron-security-groups: true to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -119,12 +106,10 @@ applications: bridge-mappings: physnet1:br-ex to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -134,7 +119,6 @@ applications: network-manager: Neutron to: - '10' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -148,7 +132,6 @@ applications: to: - '11' - '12' - channel: candidate ntp: charm: cs:ntp @@ -163,7 +146,6 @@ applications: - '13' - '14' - '15' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server @@ -172,14 +154,12 @@ applications: source: *openstack-origin to: - '16' - channel: candidate vault: num_units: 1 charm: cs:~openstack-charmers/vault to: - '17' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -188,7 +168,6 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: candidate keystone-saml-mellon1: series: focal @@ -234,14 +213,12 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate relations: diff --git a/src/tests/bundles/focal-victoria-ha.yaml b/src/tests/bundles/focal-victoria-ha.yaml index 42c9acf..c48743c 100644 --- a/src/tests/bundles/focal-victoria-ha.yaml +++ b/src/tests/bundles/focal-victoria-ha.yaml @@ -33,28 +33,20 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate openstack-dashboard-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate cinder-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -65,7 +57,6 @@ applications: - '0' - '1' - '2' - channel: candidate cinder: num_units: 1 @@ -76,7 +67,6 @@ applications: block-device: None to: - '3' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +75,6 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -97,7 +86,6 @@ applications: - '5' - '6' - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -109,7 +97,6 @@ applications: neutron-security-groups: true to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -119,12 +106,10 @@ applications: bridge-mappings: physnet1:br-ex to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -134,7 +119,6 @@ applications: network-manager: Neutron to: - '10' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -148,7 +132,6 @@ applications: to: - '11' - '12' - channel: candidate ntp: charm: cs:ntp @@ -163,7 +146,6 @@ applications: - '13' - '14' - '15' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server @@ -172,14 +154,12 @@ applications: source: *openstack-origin to: - '16' - channel: candidate vault: num_units: 1 charm: cs:~openstack-charmers/vault to: - '17' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -188,7 +168,6 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: candidate keystone-saml-mellon1: series: focal @@ -234,14 +213,12 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate relations: diff --git a/src/tests/bundles/focal-wallaby-ha.yaml b/src/tests/bundles/focal-wallaby-ha.yaml index b1d62b7..60bdfe2 100644 --- a/src/tests/bundles/focal-wallaby-ha.yaml +++ b/src/tests/bundles/focal-wallaby-ha.yaml @@ -33,28 +33,20 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate openstack-dashboard-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate cinder-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -65,7 +57,6 @@ applications: - '0' - '1' - '2' - channel: candidate cinder: num_units: 1 @@ -76,7 +67,6 @@ applications: block-device: None to: - '3' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +75,6 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -97,7 +86,6 @@ applications: - '5' - '6' - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -109,7 +97,6 @@ applications: neutron-security-groups: true to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -119,12 +106,10 @@ applications: bridge-mappings: physnet1:br-ex to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -134,7 +119,6 @@ applications: network-manager: Neutron to: - '10' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -148,7 +132,6 @@ applications: to: - '11' - '12' - channel: candidate ntp: charm: cs:ntp @@ -163,7 +146,6 @@ applications: - '13' - '14' - '15' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server @@ -172,14 +154,12 @@ applications: source: *openstack-origin to: - '16' - channel: candidate vault: num_units: 1 charm: cs:~openstack-charmers/vault to: - '17' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -188,7 +168,6 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: candidate keystone-saml-mellon1: series: focal @@ -234,14 +213,12 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate relations: diff --git a/src/tests/bundles/groovy-victoria-ha.yaml b/src/tests/bundles/groovy-victoria-ha.yaml index 2a6c0bc..3532992 100644 --- a/src/tests/bundles/groovy-victoria-ha.yaml +++ b/src/tests/bundles/groovy-victoria-ha.yaml @@ -33,28 +33,20 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate openstack-dashboard-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate cinder-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -65,7 +57,6 @@ applications: - '0' - '1' - '2' - channel: candidate cinder: num_units: 1 @@ -76,7 +67,6 @@ applications: block-device: None to: - '3' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +75,6 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -97,7 +86,6 @@ applications: - '5' - '6' - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -109,7 +97,6 @@ applications: neutron-security-groups: true to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -119,12 +106,10 @@ applications: bridge-mappings: physnet1:br-ex to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -134,7 +119,6 @@ applications: network-manager: Neutron to: - '10' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -148,7 +132,6 @@ applications: to: - '11' - '12' - channel: candidate openstack-dashboard: charm: cs:~openstack-charmers/openstack-dashboard @@ -159,7 +142,6 @@ applications: - '13' - '14' - '15' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server @@ -168,14 +150,12 @@ applications: source: *openstack-origin to: - '16' - channel: candidate vault: num_units: 1 charm: cs:~openstack-charmers/vault to: - '17' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -184,7 +164,6 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: candidate keystone-saml-mellon1: series: groovy @@ -230,14 +209,12 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate relations: diff --git a/src/tests/bundles/hirsute-wallaby-ha.yaml b/src/tests/bundles/hirsute-wallaby-ha.yaml index 258e799..2811ab6 100644 --- a/src/tests/bundles/hirsute-wallaby-ha.yaml +++ b/src/tests/bundles/hirsute-wallaby-ha.yaml @@ -33,28 +33,20 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate openstack-dashboard-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate cinder-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -65,7 +57,6 @@ applications: - '0' - '1' - '2' - channel: candidate cinder: num_units: 1 @@ -76,7 +67,6 @@ applications: block-device: None to: - '3' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +75,6 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -97,7 +86,6 @@ applications: - '5' - '6' - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -109,7 +97,6 @@ applications: neutron-security-groups: true to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -119,12 +106,10 @@ applications: bridge-mappings: physnet1:br-ex to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -134,7 +119,6 @@ applications: network-manager: Neutron to: - '10' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -148,7 +132,6 @@ applications: to: - '11' - '12' - channel: candidate openstack-dashboard: charm: cs:~openstack-charmers/openstack-dashboard @@ -159,7 +142,6 @@ applications: - '13' - '14' - '15' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server @@ -168,14 +150,12 @@ applications: source: *openstack-origin to: - '16' - channel: candidate vault: num_units: 1 charm: cs:~openstack-charmers/vault to: - '17' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -184,7 +164,6 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: candidate keystone-saml-mellon1: series: groovy @@ -230,14 +209,12 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate relations: diff --git a/src/tests/bundles/overlays/bionic-ha.yaml.j2 b/src/tests/bundles/overlays/bionic-ha.yaml.j2 index 9e2459e..dd5114a 100644 --- a/src/tests/bundles/overlays/bionic-ha.yaml.j2 +++ b/src/tests/bundles/overlays/bionic-ha.yaml.j2 @@ -18,11 +18,9 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate diff --git a/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2 b/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2 index 9e2459e..dd5114a 100644 --- a/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2 +++ b/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2 @@ -18,11 +18,9 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate diff --git a/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2 b/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2 index 9e2459e..dd5114a 100644 --- a/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2 +++ b/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2 @@ -18,11 +18,9 @@ applications: options: corosync_transport: unicast cluster_count: 3 - channel: candidate openstack-dashboard-hacluster: charm: cs:~openstack-charmers/hacluster num_units: 0 options: corosync_transport: unicast cluster_count: 3 - channel: candidate