From a3457b978ffe06b839fb145b27be1b62ec26bd4e Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 23 Apr 2020 10:28:50 -0700 Subject: [PATCH] Focal enablement Test mysql-router on focal. Change-Id: Ia54d963b29b68ac39cf00f4037a6477c0ccea472 --- src/metadata.yaml | 1 + src/tests/bundles/eoan-full.yaml | 6 +- src/tests/bundles/focal-full-ha.yaml | 1 + src/tests/bundles/focal-full.yaml | 159 ++++++++++++++++++ src/tests/bundles/{eoan.yaml => focal.yaml} | 5 +- .../bundles/overlays/eoan-full-ha.yaml.j2 | 2 +- ...{eoan-ha.yaml.j2 => focal-full-ha.yaml.j2} | 0 src/tests/tests.yaml | 38 ++++- 8 files changed, 203 insertions(+), 9 deletions(-) create mode 120000 src/tests/bundles/focal-full-ha.yaml create mode 100644 src/tests/bundles/focal-full.yaml rename src/tests/bundles/{eoan.yaml => focal.yaml} (88%) rename src/tests/bundles/overlays/{eoan-ha.yaml.j2 => focal-full-ha.yaml.j2} (100%) diff --git a/src/metadata.yaml b/src/metadata.yaml index 54d03a9..4a2a01c 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -8,6 +8,7 @@ tags: subordinate: true series: - eoan + - focal provides: shared-db: interface: mysql-shared diff --git a/src/tests/bundles/eoan-full.yaml b/src/tests/bundles/eoan-full.yaml index 609dcd1..dfe4ffb 100644 --- a/src/tests/bundles/eoan-full.yaml +++ b/src/tests/bundles/eoan-full.yaml @@ -10,6 +10,7 @@ relations: - ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"] - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - ["cinder:identity-service", "keystone:identity-service"] - ["cinder:amqp", "rabbitmq-server:amqp" ] - ["glance:identity-service", "keystone:identity-service"] @@ -24,7 +25,7 @@ relations: - ["nova-compute:image-service", "glance:image-service" ] - ["placement:placement", "nova-cloud-controller:placement"] - ["placement:identity-service", "keystone:identity-service"] -- ["placement:shared-db", "mysql-innodb-cluster:shared-db"] +- ["placement:shared-db", "placement-mysql-router:shared-db"] applications: cinder-mysql-router: charm: ../../../mysql-router @@ -36,7 +37,10 @@ applications: charm: ../../../mysql-router neutron-mysql-router: charm: ../../../mysql-router + placement-mysql-router: + charm: ../../../mysql-router mysql-innodb-cluster: + series: eoan charm: cs:~openstack-charmers-next/mysql-innodb-cluster num_units: 3 keystone: diff --git a/src/tests/bundles/focal-full-ha.yaml b/src/tests/bundles/focal-full-ha.yaml new file mode 120000 index 0000000..afb86b9 --- /dev/null +++ b/src/tests/bundles/focal-full-ha.yaml @@ -0,0 +1 @@ +focal-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/focal-full.yaml b/src/tests/bundles/focal-full.yaml new file mode 100644 index 0000000..ab8cb37 --- /dev/null +++ b/src/tests/bundles/focal-full.yaml @@ -0,0 +1,159 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series focal + +applications: + keystone-mysql-router: + charm: ../../../mysql-router + nova-mysql-router: + charm: ../../../mysql-router + glance-mysql-router: + charm: ../../../mysql-router + neutron-mysql-router: + charm: ../../../mysql-router + placement-mysql-router: + charm: ../../../mysql-router + vault-mysql-router: + charm: ../../../mysql-router + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + ovn-central: + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + series: *series + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + ovn-chassis: + charm: cs:~openstack-charmers-next/ovn-chassis + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + options: + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + openstack-origin: *openstack-origin + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + memcached: + charm: cs:memcached + num_units: 1 + series: bionic +relations: + - - neutron-api:amqp + - rabbitmq-server:amqp + - - neutron-api:neutron-api + - nova-cloud-controller:neutron-api + - - neutron-api:identity-service + - keystone:identity-service + - - nova-cloud-controller:amqp + - rabbitmq-server:amqp + - - nova-compute:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:identity-service + - keystone:identity-service + - - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute + - - glance:identity-service + - keystone:identity-service + - - glance:amqp + - rabbitmq-server:amqp + - - nova-compute:image-service + - glance:image-service + - - nova-cloud-controller:image-service + - glance:image-service + - - placement:identity-service + - keystone:identity-service + - - placement:placement + - nova-cloud-controller:placement + - - neutron-api-plugin-ovn:neutron-plugin + - neutron-api:neutron-plugin-api-subordinate + - - ovn-central:certificates + - vault:certificates + - - ovn-central:ovsdb-cms + - neutron-api-plugin-ovn:ovsdb-cms + - - neutron-api:certificates + - vault:certificates + - - ovn-chassis:nova-compute + - nova-compute:neutron-plugin + - - ovn-chassis:certificates + - vault:certificates + - - ovn-chassis:ovsdb + - ovn-central:ovsdb + - - vault:certificates + - neutron-api-plugin-ovn:certificates + - - vault:certificates + - glance:certificates + - - vault:certificates + - keystone:certificates + - - vault:certificates + - nova-cloud-controller:certificates + - - vault:certificates + - placement:certificates + - - memcached:cache + - nova-cloud-controller:memcache + - - keystone:shared-db + - keystone-mysql-router:shared-db + - - glance:shared-db + - glance-mysql-router:shared-db + - - nova-cloud-controller:shared-db + - nova-mysql-router:shared-db + - - neutron-api:shared-db + - neutron-mysql-router:shared-db + - - placement:shared-db + - placement-mysql-router:shared-db + - - vault:shared-db + - vault-mysql-router:shared-db + - - keystone-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - nova-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - glance-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - neutron-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - placement-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - vault-mysql-router:db-router + - mysql-innodb-cluster:db-router diff --git a/src/tests/bundles/eoan.yaml b/src/tests/bundles/focal.yaml similarity index 88% rename from src/tests/bundles/eoan.yaml rename to src/tests/bundles/focal.yaml index 474bc89..3d8f654 100644 --- a/src/tests/bundles/eoan.yaml +++ b/src/tests/bundles/focal.yaml @@ -1,4 +1,4 @@ -series: eoan +series: focal relations: - ["keystone:shared-db", "mysql-router:shared-db"] - ["mysql-router:db-router", "mysql-innodb-cluster:db-router"] @@ -6,10 +6,9 @@ applications: mysql-router: charm: ../../../mysql-router mysql-innodb-cluster: - series: eoan + series: focal charm: cs:~openstack-charmers-next/mysql-innodb-cluster num_units: 3 keystone: - series: eoan charm: cs:~openstack-charmers-next/keystone num_units: 1 diff --git a/src/tests/bundles/overlays/eoan-full-ha.yaml.j2 b/src/tests/bundles/overlays/eoan-full-ha.yaml.j2 index 492bbb8..40705fb 120000 --- a/src/tests/bundles/overlays/eoan-full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/eoan-full-ha.yaml.j2 @@ -1 +1 @@ -eoan-ha.yaml.j2 \ No newline at end of file +focal-full-ha.yaml.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/eoan-ha.yaml.j2 b/src/tests/bundles/overlays/focal-full-ha.yaml.j2 similarity index 100% rename from src/tests/bundles/overlays/eoan-ha.yaml.j2 rename to src/tests/bundles/overlays/focal-full-ha.yaml.j2 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 5ba8d76..b47c3c8 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,13 +1,43 @@ charm_name: mysql-router configure: - zaza.openstack.charm_tests.keystone.setup.add_demo_user -- full_model: +- eoan_full_model: - zaza.openstack.charm_tests.glance.setup.add_lts_image + - zaza.openstack.charm_tests.nova.setup.create_flavors + - zaza.openstack.charm_tests.keystone.setup.add_demo_user +- focal_full_model: + - zaza.openstack.charm_tests.vault.setup.auto_initialize + - zaza.openstack.charm_tests.glance.setup.add_lts_image + - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network + - zaza.openstack.charm_tests.nova.setup.create_flavors + - zaza.openstack.charm_tests.nova.setup.manage_ssh_key + - zaza.openstack.charm_tests.keystone.setup.add_demo_user tests: - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest +- eoan_full_model: + - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest +- focal_full_model: + - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest dev_bundles: gate_bundles: -- eoan -- full_model: eoan-full-ha +- focal_full_model: focal-full-ha +- eoan_full_model: eoan-full-ha smoke_bundles: -- eoan +- focal +tests_options: + force_deploy: + - focal + - focal-full-ha +target_deploy_status: + neutron-api-plugin-ovn: + workload-status: waiting + workload-status-message: "'ovsdb-cms' incomplete" + ovn-central: + workload-status: blocked + workload-status-message: "'certificates' missing" + ovn-chassis: + workload-status: blocked + workload-status-message: "'certificates' missing" + vault: + workload-status: blocked + workload-status-message: Vault needs to be initialized