From 91573f737697a099cfecd16c919ce3abe15a4860 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 9 Apr 2020 15:38:24 +0100 Subject: [PATCH] Add focal-ussuri-ha bundle This patch adds a focal-ussuri bundle to the tests for the charm. It also cleans up the tests.yaml and stops it doing the same test twice for gate. Change-Id: I290c089c9a20a946ec8da240e9c83d16a2cbbb03 --- src/metadata.yaml | 1 + src/tests/bundles/bionic-queens-ha.yaml | 155 +++++++- src/tests/bundles/bionic-queens-smoke-ha.yaml | 60 ++- src/tests/bundles/bionic-queens-smoke.yaml | 59 --- src/tests/bundles/bionic-queens.yaml | 154 -------- src/tests/bundles/focal-ussuri-ha.yaml | 349 ++++++++++++++++++ .../bundles/overlays/focal-ussuri-ha.yaml.j2 | 8 + src/tests/tests.yaml | 13 +- 8 files changed, 582 insertions(+), 217 deletions(-) mode change 120000 => 100644 src/tests/bundles/bionic-queens-ha.yaml mode change 120000 => 100644 src/tests/bundles/bionic-queens-smoke-ha.yaml delete mode 100644 src/tests/bundles/bionic-queens-smoke.yaml delete mode 100644 src/tests/bundles/bionic-queens.yaml create mode 100644 src/tests/bundles/focal-ussuri-ha.yaml create mode 100644 src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 diff --git a/src/metadata.yaml b/src/metadata.yaml index e56e322..417097c 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -26,6 +26,7 @@ series: - xenial - bionic - eoan + - focal provides: keystone-fid-service-provider: interface: keystone-fid-service-provider diff --git a/src/tests/bundles/bionic-queens-ha.yaml b/src/tests/bundles/bionic-queens-ha.yaml deleted file mode 120000 index 2f45b67..0000000 --- a/src/tests/bundles/bionic-queens-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -bionic-queens.yaml \ No newline at end of file diff --git a/src/tests/bundles/bionic-queens-ha.yaml b/src/tests/bundles/bionic-queens-ha.yaml new file mode 100644 index 0000000..b840193 --- /dev/null +++ b/src/tests/bundles/bionic-queens-ha.yaml @@ -0,0 +1,154 @@ +relations: +- - nova-compute:amqp + - rabbitmq-server:amqp +- - neutron-gateway:amqp + - rabbitmq-server:amqp +- - keystone:shared-db + - mysql:shared-db +- - nova-cloud-controller:identity-service + - keystone:identity-service +- - glance:identity-service + - keystone:identity-service +- - neutron-api:identity-service + - keystone:identity-service +- - neutron-openvswitch:neutron-plugin-api + - neutron-api:neutron-plugin-api +- - neutron-api:shared-db + - mysql:shared-db +- - neutron-api:amqp + - rabbitmq-server:amqp +- - neutron-gateway:neutron-plugin-api + - neutron-api:neutron-plugin-api +- - glance:shared-db + - mysql:shared-db +- - glance:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:image-service + - glance:image-service +- - nova-compute:image-service + - glance:image-service +- - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute +- - nova-cloud-controller:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:quantum-network-service + - neutron-gateway:quantum-network-service +- - nova-compute:neutron-plugin + - neutron-openvswitch:neutron-plugin +- - neutron-openvswitch:amqp + - rabbitmq-server:amqp +- - openstack-dashboard:identity-service + - keystone:identity-service +- - openstack-dashboard:shared-db + - mysql:shared-db +- - nova-cloud-controller:shared-db + - mysql:shared-db +- - nova-cloud-controller:neutron-api + - neutron-api:neutron-api +- - cinder:image-service + - glance:image-service +- - cinder:amqp + - rabbitmq-server:amqp +- - cinder:identity-service + - keystone:identity-service +- - cinder:cinder-volume-service + - nova-cloud-controller:cinder-volume-service +- - cinder:shared-db + - mysql:shared-db +- - ntp:juju-info + - nova-compute:juju-info +- - ntp:juju-info + - neutron-gateway:juju-info +- - keystone + - keystone-saml-mellon +- - vault:shared-db + - mysql:shared-db +- - vault:certificates + - keystone:certificates +- - vault:certificates + - glance:certificates +- - vault:certificates + - openstack-dashboard:certificates +- - openstack-dashboard + - keystone-saml-mellon +- - keystone:websso-trusted-dashboard + - openstack-dashboard:websso-trusted-dashboard +- - vault:certificates + - cinder:certificates +- - vault:certificates + - neutron-api:certificates +- - vault:certificates + - nova-cloud-controller:certificates + +series: bionic +services: + cinder: + charm: cs:~openstack-charmers-next/cinder + num_units: 1 + options: + block-device: None + glance-api-version: 2 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + token-provider: 'fernet' + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + constraints: mem=3072M + options: + innodb-buffer-pool-size: 256M + max-connections: 1000 + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + bridge-mappings: physnet1:br-ex + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + options: + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + ntp: + charm: cs:ntp + num_units: 0 + openstack-dashboard: + charm: cs:~openstack-charmers-next/openstack-dashboard + num_units: 1 + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + vault: + num_units: 1 + charm: cs:~openstack-charmers-next/vault + keystone-saml-mellon: + series: bionic + charm: ../../../keystone-saml-mellon + num_units: 0 + options: + idp-name: 'samltest' + protocol-name: 'mapped' + user-facing-name: "samltest.id" + subject-confirmation-data-address-check: False + nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" diff --git a/src/tests/bundles/bionic-queens-smoke-ha.yaml b/src/tests/bundles/bionic-queens-smoke-ha.yaml deleted file mode 120000 index a1c4db4..0000000 --- a/src/tests/bundles/bionic-queens-smoke-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -bionic-queens-smoke.yaml \ No newline at end of file diff --git a/src/tests/bundles/bionic-queens-smoke-ha.yaml b/src/tests/bundles/bionic-queens-smoke-ha.yaml new file mode 100644 index 0000000..1ee7b47 --- /dev/null +++ b/src/tests/bundles/bionic-queens-smoke-ha.yaml @@ -0,0 +1,59 @@ +series: bionic +relations: +- - keystone:shared-db + - mysql:shared-db +- - glance:shared-db + - mysql:shared-db +- - glance:identity-service + - keystone:identity-service +- - keystone + - keystone-saml-mellon +- - vault:shared-db + - mysql:shared-db +- - vault:certificates + - keystone:certificates +- - vault:certificates + - glance:certificates +- - vault:certificates + - openstack-dashboard:certificates +- - openstack-dashboard + - keystone-saml-mellon +- - keystone:websso-trusted-dashboard + - openstack-dashboard:websso-trusted-dashboard +- - openstack-dashboard:identity-service + - keystone:identity-service +applications: + mysql: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + keystone: + series: bionic + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + token-provider: 'fernet' + token-expiration: 60 + keystone-saml-mellon: + series: bionic + charm: ../../../keystone-saml-mellon + num_units: 0 + options: + idp-name: 'samltest' + protocol-name: 'mapped' + user-facing-name: "samltest.id" + subject-confirmation-data-address-check: False + nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" + resources: + idp-metadata: "./idp-metadata.xml" + sp-signing-keyinfo: "./sp-signing-keyinfo.xml" + sp-private-key: "./sp-private-key.pem" + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + vault: + num_units: 1 + charm: cs:~openstack-charmers-next/vault + openstack-dashboard: + num_units: 1 + charm: cs:~openstack-charmers-next/openstack-dashboard diff --git a/src/tests/bundles/bionic-queens-smoke.yaml b/src/tests/bundles/bionic-queens-smoke.yaml deleted file mode 100644 index 1ee7b47..0000000 --- a/src/tests/bundles/bionic-queens-smoke.yaml +++ /dev/null @@ -1,59 +0,0 @@ -series: bionic -relations: -- - keystone:shared-db - - mysql:shared-db -- - glance:shared-db - - mysql:shared-db -- - glance:identity-service - - keystone:identity-service -- - keystone - - keystone-saml-mellon -- - vault:shared-db - - mysql:shared-db -- - vault:certificates - - keystone:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - openstack-dashboard - - keystone-saml-mellon -- - keystone:websso-trusted-dashboard - - openstack-dashboard:websso-trusted-dashboard -- - openstack-dashboard:identity-service - - keystone:identity-service -applications: - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - keystone: - series: bionic - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - token-provider: 'fernet' - token-expiration: 60 - keystone-saml-mellon: - series: bionic - charm: ../../../keystone-saml-mellon - num_units: 0 - options: - idp-name: 'samltest' - protocol-name: 'mapped' - user-facing-name: "samltest.id" - subject-confirmation-data-address-check: False - nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" - resources: - idp-metadata: "./idp-metadata.xml" - sp-signing-keyinfo: "./sp-signing-keyinfo.xml" - sp-private-key: "./sp-private-key.pem" - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - openstack-dashboard: - num_units: 1 - charm: cs:~openstack-charmers-next/openstack-dashboard diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml deleted file mode 100644 index b840193..0000000 --- a/src/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,154 +0,0 @@ -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - neutron-api:shared-db - - mysql:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - openstack-dashboard:identity-service - - keystone:identity-service -- - openstack-dashboard:shared-db - - mysql:shared-db -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - cinder:image-service - - glance:image-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:identity-service - - keystone:identity-service -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:shared-db - - mysql:shared-db -- - ntp:juju-info - - nova-compute:juju-info -- - ntp:juju-info - - neutron-gateway:juju-info -- - keystone - - keystone-saml-mellon -- - vault:shared-db - - mysql:shared-db -- - vault:certificates - - keystone:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - openstack-dashboard - - keystone-saml-mellon -- - keystone:websso-trusted-dashboard - - openstack-dashboard:websso-trusted-dashboard -- - vault:certificates - - cinder:certificates -- - vault:certificates - - neutron-api:certificates -- - vault:certificates - - nova-cloud-controller:certificates - -series: bionic -services: - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - token-provider: 'fernet' - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - constraints: mem=3072M - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - ntp: - charm: cs:ntp - num_units: 0 - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - keystone-saml-mellon: - series: bionic - charm: ../../../keystone-saml-mellon - num_units: 0 - options: - idp-name: 'samltest' - protocol-name: 'mapped' - user-facing-name: "samltest.id" - subject-confirmation-data-address-check: False - nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" diff --git a/src/tests/bundles/focal-ussuri-ha.yaml b/src/tests/bundles/focal-ussuri-ha.yaml new file mode 100644 index 0000000..1768c46 --- /dev/null +++ b/src/tests/bundles/focal-ussuri-ha.yaml @@ -0,0 +1,349 @@ +variables: + openstack-origin: &openstack-origin distro + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + '14': + '15': + '16': + '17': + '18': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + openstack-dashboard-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + cinder-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + cinder: + num_units: 1 + charm: cs:~openstack-charmers-next/cinder + options: + openstack-origin: *openstack-origin + glance-api-version: 2 + block-device: None + to: + - '3' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 3 + options: + openstack-origin: *openstack-origin + token-provider: 'fernet' + to: + - '5' + - '6' + - '7' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + manage-neutron-plugin-legacy-mode: true + flat-network-providers: physnet1 + neutron-security-groups: true + to: + - '8' + + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + openstack-origin: *openstack-origin + bridge-mappings: physnet1:br-ex + to: + - '9' + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + to: + - '10' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + options: + openstack-origin: *openstack-origin + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + to: + - '11' + - '12' + + ntp: + charm: cs:ntp + num_units: 0 + + openstack-dashboard: + charm: cs:~openstack-charmers-next/openstack-dashboard + num_units: 3 + options: + openstack-origin: *openstack-origin + to: + - '13' + - '14' + - '15' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '16' + + vault: + num_units: 1 + charm: cs:~openstack-charmers-next/vault + to: + - '17' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '18' + + keystone-saml-mellon: + series: focal + charm: ../../../keystone-saml-mellon + num_units: 0 + options: + idp-name: 'samltest' + protocol-name: 'mapped' + user-facing-name: "samltest.id" + subject-confirmation-data-address-check: False + nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" + + keystone-hacluster: + charm: cs:~openstack-charmers-next/hacluster + num_units: 0 + options: + corosync_transport: unicast + cluster_count: 3 + openstack-dashboard-hacluster: + charm: cs:~openstack-charmers-next/hacluster + num_units: 0 + options: + corosync_transport: unicast + cluster_count: 3 + +relations: + + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server:amqp' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:identity-service' + - 'keystone:identity-service' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' + + - - 'neutron-openvswitch:neutron-plugin-api' + - 'neutron-api:neutron-plugin-api' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:neutron-plugin-api' + - 'neutron-api:neutron-plugin-api' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:quantum-network-service' + - 'neutron-gateway:quantum-network-service' + + - - 'nova-compute:neutron-plugin' + - 'neutron-openvswitch:neutron-plugin' + + - - 'neutron-openvswitch:amqp' + - 'rabbitmq-server:amqp' + + - - 'openstack-dashboard:identity-service' + - 'keystone:identity-service' + + - - 'openstack-dashboard:shared-db' + - 'openstack-dashboard-mysql-router:shared-db' + - - 'openstack-dashboard-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:neutron-api' + - 'neutron-api:neutron-api' + + - - 'cinder:image-service' + - 'glance:image-service' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - 'cinder:cinder-volume-service' + - 'nova-cloud-controller:cinder-volume-service' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'ntp:juju-info' + - 'nova-compute:juju-info' + + - - 'ntp:juju-info' + - 'neutron-gateway:juju-info' + + - - 'keystone' + - 'keystone-saml-mellon' + + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'vault:certificates' + - 'keystone:certificates' + + - - 'vault:certificates' + - 'glance:certificates' + + - - 'vault:certificates' + - 'openstack-dashboard:certificates' + + - - 'openstack-dashboard' + - 'keystone-saml-mellon' + + - - 'keystone:websso-trusted-dashboard' + - 'openstack-dashboard:websso-trusted-dashboard' + + - - 'vault:certificates' + - 'cinder:certificates' + + - - 'vault:certificates' + - 'neutron-api:certificates' + + - - 'vault:certificates' + - 'nova-cloud-controller:certificates' + + - - 'placement:identity-service' + - 'keystone:identity-service' + + - - 'placement:placement' + - 'nova-cloud-controller:placement' + + - - 'vault:certificates' + - 'placement:certificates' + + - - "placement:shared-db" + - "placement-mysql-router:shared-db" + - - "placement-mysql-router:db-router" + - "mysql-innodb-cluster:db-router" + + - - "keystone:ha" + - "keystone-hacluster:ha" + - - "openstack-dashboard:ha" + - "openstack-dashboard-hacluster:ha" diff --git a/src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 b/src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 new file mode 100644 index 0000000..eb28ddc --- /dev/null +++ b/src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 @@ -0,0 +1,8 @@ +series: focal +applications: + keystone: + options: + vip: {{ OS_VIP00 }} + openstack-dashboard: + options: + vip: {{ OS_VIP01 }} diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 19b163b..6cc980c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,9 +1,12 @@ charm_name: keystone-saml-mellon + smoke_bundles: -- bionic-queens +- bionic-queens-smoke-ha + gate_bundles: -- bionic-queens - bionic-queens-ha +- focal-ussuri-ha + configure: - zaza.openstack.charm_tests.vault.setup.auto_initialize - zaza.openstack.charm_tests.saml_mellon.setup.attach_saml_resources @@ -13,9 +16,11 @@ configure: - zaza.openstack.charm_tests.nova.setup.manage_ssh_key - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network - zaza.openstack.charm_tests.saml_mellon.setup.keystone_federation_setup + tests: - zaza.openstack.charm_tests.saml_mellon.tests.CharmKeystoneSAMLMellonTest - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest + target_deploy_status: ntp: workload-status: active @@ -26,3 +31,7 @@ target_deploy_status: keystone-saml-mellon: workload-status: blocked workload-status-message: "Configuration is incomplete. idp-metadata: idp-metadata resource is not a well-formed xml file" + +tests_options: + force_deploy: + - focal-ussuri-ha