diff --git a/.gitreview b/.gitreview index afac541..ace2dd8 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-mysql-innodb-cluster.git + +defaultbranch=stable/21.10 diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 0000000..477c7c2 --- /dev/null +++ b/src/build.lock @@ -0,0 +1,216 @@ +{ + "locks": [ + { + "type": "layer", + "item": "layer:options", + "url": "https://github.com/juju-solutions/layer-options.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56" + }, + { + "type": "layer", + "item": "layer:basic", + "url": "https://github.com/juju-solutions/layer-basic.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "a3ff62c32c993d80417f6e093e3ef95e42f62083" + }, + { + "type": "layer", + "item": "layer:coordinator", + "url": "https://git.launchpad.net/layer-coordinator ", + "vcs": null, + "branch": "refs/heads/master", + "commit": "fa27fc93e0b08000963e83a6bfe49812d890dfcf" + }, + { + "type": "layer", + "item": "layer:leadership", + "url": "https://git.launchpad.net/layer-leadership", + "vcs": null, + "branch": "refs/heads/master", + "commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f" + }, + { + "type": "layer", + "item": "layer:snap", + "url": "https://git.launchpad.net/layer-snap", + "vcs": null, + "branch": "refs/heads/master", + "commit": "d935a04074740e14feb0b73d485952b2546ae04c" + }, + { + "type": "layer", + "item": "layer:openstack", + "url": "https://github.com/openstack/charm-layer-openstack", + "vcs": null, + "branch": "refs/heads/master", + "commit": "207bac8bec837edc6a4d6003f51d5b59d2d75adb" + }, + { + "type": "layer", + "item": "mysql-innodb-cluster", + "url": null, + "vcs": null, + "branch": "refs/heads/21.10-updates\nrefs/heads/master", + "commit": "refs/heads/21.10-updates\nrefs/heads/master" + }, + { + "type": "layer", + "item": "interface:tls-certificates", + "url": "https://github.com/juju-solutions/interface-tls-certificates", + "vcs": null, + "branch": "refs/heads/master", + "commit": "d9850016d930a6d507b9fd45e2598d327922b140" + }, + { + "type": "layer", + "item": "interface:mysql-shared", + "url": "https://github.com/openstack/charm-interface-mysql-shared", + "vcs": null, + "branch": "refs/heads/master", + "commit": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c" + }, + { + "type": "layer", + "item": "interface:mysql-router", + "url": "https://github.com/openstack/charm-interface-mysql-router.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "f6ebeef9ae56f18a4e41d51da946a4dffcd8ccd9" + }, + { + "type": "layer", + "item": "interface:mysql-innodb-cluster", + "url": "https://github.com/openstack/charm-interface-mysql-innodb-cluster.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "5f87bb1ddec3868864d2a8d1bf9b66ae5dca4e48" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "2.10.1" + }, + { + "type": "python_module", + "package": "psutil", + "vcs": null, + "version": "5.8.0" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "41.6.0" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "18.1" + }, + { + "type": "python_module", + "package": "mysqlclient", + "vcs": null, + "version": "2.0.3" + }, + { + "type": "python_module", + "package": "pbr", + "vcs": null, + "version": "5.6.0" + }, + { + "type": "python_module", + "package": "dnspython", + "vcs": null, + "version": "1.16.0" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "5.2" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "1.17.0" + }, + { + "type": "python_module", + "package": "netifaces", + "vcs": null, + "version": "0.11.0" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "1.1.1" + }, + { + "type": "python_module", + "package": "Tempita", + "vcs": null, + "version": "0.4" + }, + { + "type": "python_module", + "package": "charms.openstack", + "url": "git+https://github.com/openstack/charms.openstack.git", + "branch": "refs/heads/stable/21.10", + "version": "10627ee5f991c268f174d6d100e218a0e1867af1", + "vcs": "git" + }, + { + "type": "python_module", + "package": "tenacity", + "vcs": null, + "version": "7.0.0" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.4.1" + }, + { + "type": "python_module", + "package": "six", + "vcs": null, + "version": "1.16.0" + }, + { + "type": "python_module", + "package": "charmhelpers", + "url": "git+https://github.com/juju/charm-helpers.git", + "branch": "refs/heads/stable/21.10", + "version": "26efcd0da51d580f68ead2ca13c38f58766f8a14", + "vcs": "git" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.33.6" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "21.10.1" + } + ] +} \ No newline at end of file diff --git a/src/test-requirements.txt b/src/test-requirements.txt index e771023..bd0c1a8 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -5,5 +5,5 @@ # # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) -git+https://github.com/openstack-charmers/zaza.git#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack diff --git a/src/tests/bundles/focal-full-ha.yaml b/src/tests/bundles/focal-full-ha.yaml deleted file mode 120000 index afb86b9..0000000 --- a/src/tests/bundles/focal-full-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -focal-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/focal-full-ha.yaml b/src/tests/bundles/focal-full-ha.yaml new file mode 100644 index 0000000..92401e4 --- /dev/null +++ b/src/tests/bundles/focal-full-ha.yaml @@ -0,0 +1,178 @@ +variables: + openstack-origin: &openstack-origin distro-proposed + +series: &series focal + +applications: + keystone-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + nova-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + glance-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + neutron-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + placement-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + vault-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + mysql-innodb-cluster: + charm: ../../../mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + keystone: + charm: cs:~openstack-charmers/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + rabbitmq-server: + charm: cs:~openstack-charmers/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + channel: candidate + vault: + charm: cs:~openstack-charmers/vault + num_units: 1 + channel: candidate + ovn-central: + charm: cs:~openstack-charmers/ovn-central + num_units: 3 + options: + source: *openstack-origin + channel: candidate + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate + neutron-api: + charm: cs:~openstack-charmers/neutron-api + series: *series + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + channel: candidate + glance: + charm: cs:~openstack-charmers/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + nova-cloud-controller: + charm: cs:~openstack-charmers/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + channel: candidate + ovn-chassis: + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate + nova-compute: + charm: cs:~openstack-charmers/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 + channel: candidate + placement: + charm: cs:~openstack-charmers/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + 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 + - - vault:certificates + - mysql-innodb-cluster: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/focal-full.yaml b/src/tests/bundles/focal-full.yaml index 861a1c5..92401e4 100644 --- a/src/tests/bundles/focal-full.yaml +++ b/src/tests/bundles/focal-full.yaml @@ -5,65 +5,80 @@ series: &series focal applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 options: source: *openstack-origin keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin + channel: candidate neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -71,11 +86,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate memcached: charm: cs:memcached num_units: 1 diff --git a/src/tests/bundles/focal.yaml b/src/tests/bundles/focal.yaml index b849d84..7e9601b 100644 --- a/src/tests/bundles/focal.yaml +++ b/src/tests/bundles/focal.yaml @@ -1,19 +1,23 @@ series: focal applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: series: focal charm: ../../../mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate relations: - - vault:certificates - mysql-innodb-cluster:certificates diff --git a/src/tests/bundles/groovy-full-ha.yaml b/src/tests/bundles/groovy-full-ha.yaml deleted file mode 120000 index 4245b47..0000000 --- a/src/tests/bundles/groovy-full-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -groovy-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/groovy-full-ha.yaml b/src/tests/bundles/groovy-full-ha.yaml new file mode 100644 index 0000000..ace23f5 --- /dev/null +++ b/src/tests/bundles/groovy-full-ha.yaml @@ -0,0 +1,178 @@ +variables: + openstack-origin: &openstack-origin distro-proposed + +series: &series groovy + +applications: + keystone-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + nova-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + glance-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + neutron-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + placement-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + vault-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + mysql-innodb-cluster: + charm: ../../../mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + keystone: + charm: cs:~openstack-charmers/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + rabbitmq-server: + charm: cs:~openstack-charmers/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + channel: candidate + vault: + charm: cs:~openstack-charmers/vault + num_units: 1 + channel: candidate + ovn-central: + charm: cs:~openstack-charmers/ovn-central + num_units: 3 + options: + source: *openstack-origin + channel: candidate + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate + neutron-api: + charm: cs:~openstack-charmers/neutron-api + series: *series + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + channel: candidate + glance: + charm: cs:~openstack-charmers/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + nova-cloud-controller: + charm: cs:~openstack-charmers/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + channel: candidate + ovn-chassis: + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate + nova-compute: + charm: cs:~openstack-charmers/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 + channel: candidate + placement: + charm: cs:~openstack-charmers/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + 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 + - - vault:certificates + - mysql-innodb-cluster: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/groovy-full.yaml b/src/tests/bundles/groovy-full.yaml index 9905cfe..ace23f5 100644 --- a/src/tests/bundles/groovy-full.yaml +++ b/src/tests/bundles/groovy-full.yaml @@ -5,65 +5,80 @@ series: &series groovy applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 options: source: *openstack-origin keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin + channel: candidate neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -71,11 +86,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate memcached: charm: cs:memcached num_units: 1 diff --git a/src/tests/bundles/groovy.yaml b/src/tests/bundles/groovy.yaml index 2241e53..3812848 100644 --- a/src/tests/bundles/groovy.yaml +++ b/src/tests/bundles/groovy.yaml @@ -1,19 +1,23 @@ series: groovy applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: series: groovy charm: ../../../mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate relations: - - vault:certificates - mysql-innodb-cluster:certificates diff --git a/src/tests/bundles/hirsute-full-ha.yaml b/src/tests/bundles/hirsute-full-ha.yaml deleted file mode 120000 index cdca6df..0000000 --- a/src/tests/bundles/hirsute-full-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -hirsute-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/hirsute-full-ha.yaml b/src/tests/bundles/hirsute-full-ha.yaml new file mode 100644 index 0000000..4ee7b90 --- /dev/null +++ b/src/tests/bundles/hirsute-full-ha.yaml @@ -0,0 +1,178 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series hirsute + +applications: + keystone-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + nova-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + glance-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + neutron-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + placement-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + vault-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + mysql-innodb-cluster: + charm: ../../../mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + keystone: + charm: cs:~openstack-charmers/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + rabbitmq-server: + charm: cs:~openstack-charmers/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + channel: candidate + vault: + charm: cs:~openstack-charmers/vault + num_units: 1 + channel: candidate + ovn-central: + charm: cs:~openstack-charmers/ovn-central + num_units: 3 + options: + source: *openstack-origin + channel: candidate + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate + neutron-api: + charm: cs:~openstack-charmers/neutron-api + series: *series + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + channel: candidate + glance: + charm: cs:~openstack-charmers/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + nova-cloud-controller: + charm: cs:~openstack-charmers/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + channel: candidate + ovn-chassis: + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate + nova-compute: + charm: cs:~openstack-charmers/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 + channel: candidate + placement: + charm: cs:~openstack-charmers/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + memcached: + charm: cs:memcached + num_units: 1 + series: focal +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 + - - vault:certificates + - mysql-innodb-cluster: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/hirsute-full.yaml b/src/tests/bundles/hirsute-full.yaml index 5e38d24..4ee7b90 100644 --- a/src/tests/bundles/hirsute-full.yaml +++ b/src/tests/bundles/hirsute-full.yaml @@ -5,65 +5,80 @@ series: &series hirsute applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 options: source: *openstack-origin keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin + channel: candidate neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -71,11 +86,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate memcached: charm: cs:memcached num_units: 1 diff --git a/src/tests/bundles/hirsute.yaml b/src/tests/bundles/hirsute.yaml index eb43080..4d98daf 100644 --- a/src/tests/bundles/hirsute.yaml +++ b/src/tests/bundles/hirsute.yaml @@ -1,18 +1,22 @@ series: hirsute applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate relations: - - vault:certificates - mysql-innodb-cluster:certificates diff --git a/src/tests/bundles/impish-full-ha.yaml b/src/tests/bundles/impish-full-ha.yaml deleted file mode 120000 index e135644..0000000 --- a/src/tests/bundles/impish-full-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -impish-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/impish-full-ha.yaml b/src/tests/bundles/impish-full-ha.yaml new file mode 100644 index 0000000..98fe8eb --- /dev/null +++ b/src/tests/bundles/impish-full-ha.yaml @@ -0,0 +1,178 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series impish + +applications: + keystone-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + nova-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + glance-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + neutron-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + placement-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + vault-mysql-router: + charm: cs:~openstack-charmers/mysql-router + channel: candidate + mysql-innodb-cluster: + charm: ../../../mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + keystone: + charm: cs:~openstack-charmers/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + rabbitmq-server: + charm: cs:~openstack-charmers/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + channel: candidate + vault: + charm: cs:~openstack-charmers/vault + num_units: 1 + channel: candidate + ovn-central: + charm: cs:~openstack-charmers/ovn-central + num_units: 3 + options: + source: *openstack-origin + channel: candidate + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate + neutron-api: + charm: cs:~openstack-charmers/neutron-api + series: *series + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + channel: candidate + glance: + charm: cs:~openstack-charmers/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + nova-cloud-controller: + charm: cs:~openstack-charmers/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + channel: candidate + ovn-chassis: + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate + nova-compute: + charm: cs:~openstack-charmers/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 + channel: candidate + placement: + charm: cs:~openstack-charmers/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: candidate + memcached: + charm: cs:memcached + num_units: 1 + series: focal +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 + - - vault:certificates + - mysql-innodb-cluster: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/impish-full.yaml b/src/tests/bundles/impish-full.yaml index 673d954..98fe8eb 100644 --- a/src/tests/bundles/impish-full.yaml +++ b/src/tests/bundles/impish-full.yaml @@ -5,65 +5,80 @@ series: &series impish applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 options: source: *openstack-origin keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin + channel: candidate neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -71,11 +86,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate memcached: charm: cs:memcached num_units: 1 diff --git a/src/tests/bundles/impish.yaml b/src/tests/bundles/impish.yaml index 3997ba1..94daa6b 100644 --- a/src/tests/bundles/impish.yaml +++ b/src/tests/bundles/impish.yaml @@ -1,18 +1,22 @@ series: impish applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 + channel: candidate vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 + channel: candidate relations: - - vault:certificates - mysql-innodb-cluster:certificates diff --git a/src/tests/bundles/overlays/focal-full-ha.yaml.j2 b/src/tests/bundles/overlays/focal-full-ha.yaml.j2 index 2d8fd26..bf097b8 100644 --- a/src/tests/bundles/overlays/focal-full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/focal-full-ha.yaml.j2 @@ -8,9 +8,11 @@ applications: options: vip: {{TEST_VIP01}} keystone-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate nova-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate relations: - ["keystone:ha", "keystone-hacluster:ha"] - ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 b/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 index 2d8fd26..bf097b8 100644 --- a/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 @@ -8,9 +8,11 @@ applications: options: vip: {{TEST_VIP01}} keystone-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate nova-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate relations: - ["keystone:ha", "keystone-hacluster:ha"] - ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 b/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 index 2d8fd26..bf097b8 100644 --- a/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 @@ -8,9 +8,11 @@ applications: options: vip: {{TEST_VIP01}} keystone-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate nova-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate relations: - ["keystone:ha", "keystone-hacluster:ha"] - ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/tests/bundles/overlays/impish-full-ha.yaml.j2 b/src/tests/bundles/overlays/impish-full-ha.yaml.j2 index 2d8fd26..bf097b8 100644 --- a/src/tests/bundles/overlays/impish-full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/impish-full-ha.yaml.j2 @@ -8,9 +8,11 @@ applications: options: vip: {{TEST_VIP01}} keystone-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate nova-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster + channel: candidate relations: - ["keystone:ha", "keystone-hacluster:ha"] - ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 06fd94e..b3d3665 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -2,6 +2,6 @@ mysqlclient psutil tenacity<8.0.0 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index af069e1..4afbb28 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,6 +3,7 @@ # choices of *requirements.txt files for OpenStack Charms: # https://github.com/openstack-charmers/release-tools # +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 stestr>=2.2.0 @@ -33,7 +34,7 @@ mock>=1.2; python_version >= '3.6' nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack # # Revisit for removal / mock improvement: #