diff --git a/.gitreview b/.gitreview index 496586e6..5dcb268b 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-ceph-radosgw.git + +defaultbranch=stable/21.01 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index fa9cd645..248efb83 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers +repo: https://github.com/juju/charm-helpers@stable/21.01 destination: hooks/charmhelpers include: - core diff --git a/test-requirements.txt b/test-requirements.txt index 9aea716b..d44b778d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -42,8 +42,8 @@ oslo.utils<=3.41.0;python_version<'3.6' coverage>=4.5.2 pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) -git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0' -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza;python_version>='3.0' +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack # Needed for charm-glance: git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6' diff --git a/tests/bundles/bionic-queens-multisite.yaml b/tests/bundles/bionic-queens-multisite.yaml index ca5686c9..ec54635e 100644 --- a/tests/bundles/bionic-queens-multisite.yaml +++ b/tests/bundles/bionic-queens-multisite.yaml @@ -13,7 +13,7 @@ applications: zone: east-1 region: east-1 east-ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -21,7 +21,7 @@ applications: options: source: *source east-ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -36,7 +36,7 @@ applications: zone: west-1 region: west-1 west-ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -44,16 +44,16 @@ applications: options: source: *source west-ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source diff --git a/tests/bundles/bionic-queens-namespaced.yaml b/tests/bundles/bionic-queens-namespaced.yaml index a3d4fec3..af6f90fb 100644 --- a/tests/bundles/bionic-queens-namespaced.yaml +++ b/tests/bundles/bionic-queens-namespaced.yaml @@ -10,7 +10,7 @@ applications: source: *source namespace-tenants: True ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -19,21 +19,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index c7a4393f..a84949b2 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,21 +18,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-rocky-multisite.yaml b/tests/bundles/bionic-rocky-multisite.yaml index 97eb3f32..6ff47cc6 100644 --- a/tests/bundles/bionic-rocky-multisite.yaml +++ b/tests/bundles/bionic-rocky-multisite.yaml @@ -13,7 +13,7 @@ applications: zone: east-1 region: east-1 east-ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -21,7 +21,7 @@ applications: options: source: *source east-ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -36,7 +36,7 @@ applications: zone: west-1 region: west-1 west-ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -44,16 +44,16 @@ applications: options: source: *source west-ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source diff --git a/tests/bundles/bionic-rocky-namespaced.yaml b/tests/bundles/bionic-rocky-namespaced.yaml index 277995f9..b11f22b8 100644 --- a/tests/bundles/bionic-rocky-namespaced.yaml +++ b/tests/bundles/bionic-rocky-namespaced.yaml @@ -10,7 +10,7 @@ applications: source: *source namespace-tenants: True ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -19,21 +19,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 292229fd..ca7e61c9 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,21 +18,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-stein-namespaced.yaml b/tests/bundles/bionic-stein-namespaced.yaml index 62e7f7c2..874c2609 100644 --- a/tests/bundles/bionic-stein-namespaced.yaml +++ b/tests/bundles/bionic-stein-namespaced.yaml @@ -10,7 +10,7 @@ applications: source: *source namespace-tenants: True ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -19,21 +19,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index b9bc6c12..3617911d 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,21 +18,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-train-namespaced.yaml b/tests/bundles/bionic-train-namespaced.yaml index c654ab78..4b192162 100644 --- a/tests/bundles/bionic-train-namespaced.yaml +++ b/tests/bundles/bionic-train-namespaced.yaml @@ -10,7 +10,7 @@ applications: source: *source namespace-tenants: True ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -19,21 +19,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 785fdfc3..8108a195 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,21 +18,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-ussuri-namespaced.yaml b/tests/bundles/bionic-ussuri-namespaced.yaml index c5036b63..1f91a972 100644 --- a/tests/bundles/bionic-ussuri-namespaced.yaml +++ b/tests/bundles/bionic-ussuri-namespaced.yaml @@ -10,7 +10,7 @@ applications: source: *source namespace-tenants: True ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -19,21 +19,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index fcdd19de..d9a6d0f9 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,21 +18,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db diff --git a/tests/bundles/focal-ussuri-ec.yaml b/tests/bundles/focal-ussuri-ec.yaml index 740efaed..00bd6d2a 100644 --- a/tests/bundles/focal-ussuri-ec.yaml +++ b/tests/bundles/focal-ussuri-ec.yaml @@ -28,10 +28,10 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *source @@ -52,7 +52,7 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 constraints: "mem=2048" storage: @@ -69,7 +69,7 @@ applications: - '14' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -80,7 +80,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source @@ -88,10 +88,10 @@ applications: - '10' vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' diff --git a/tests/bundles/focal-ussuri-namespaced.yaml b/tests/bundles/focal-ussuri-namespaced.yaml index dd3f4591..1a6779f1 100644 --- a/tests/bundles/focal-ussuri-namespaced.yaml +++ b/tests/bundles/focal-ussuri-namespaced.yaml @@ -25,10 +25,10 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *source @@ -47,7 +47,7 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -61,7 +61,7 @@ applications: - '6' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -72,7 +72,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source @@ -80,10 +80,10 @@ applications: - '10' vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 91c3a831..8972315c 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -25,10 +25,10 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *source @@ -46,7 +46,7 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -60,7 +60,7 @@ applications: - '6' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -71,7 +71,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source @@ -79,10 +79,10 @@ applications: - '10' vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' diff --git a/tests/bundles/focal-victoria-namespaced.yaml b/tests/bundles/focal-victoria-namespaced.yaml index 9e5c423c..f880a686 100644 --- a/tests/bundles/focal-victoria-namespaced.yaml +++ b/tests/bundles/focal-victoria-namespaced.yaml @@ -25,10 +25,10 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *source @@ -47,7 +47,7 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -61,7 +61,7 @@ applications: - '6' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -72,7 +72,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source @@ -80,10 +80,10 @@ applications: - '10' vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index ddfba9d9..da78b98b 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -25,10 +25,10 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *source @@ -46,7 +46,7 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -60,7 +60,7 @@ applications: - '6' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -71,7 +71,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source @@ -79,10 +79,10 @@ applications: - '10' vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' diff --git a/tests/bundles/groovy-victoria-namespaced.yaml b/tests/bundles/groovy-victoria-namespaced.yaml index 33cf983b..28bf2fff 100644 --- a/tests/bundles/groovy-victoria-namespaced.yaml +++ b/tests/bundles/groovy-victoria-namespaced.yaml @@ -25,10 +25,10 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *source @@ -47,7 +47,7 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -61,7 +61,7 @@ applications: - '6' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -72,7 +72,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source @@ -80,10 +80,10 @@ applications: - '10' vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index b7eaa117..5135772d 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -25,10 +25,10 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *source @@ -46,7 +46,7 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -60,7 +60,7 @@ applications: - '6' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -71,7 +71,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source @@ -79,10 +79,10 @@ applications: - '10' vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index b56a0129..5e81c5b2 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,7 +18,7 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source @@ -27,7 +27,7 @@ applications: num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source diff --git a/tests/bundles/xenial-mitaka-namespaced.yaml b/tests/bundles/xenial-mitaka-namespaced.yaml index a7af5178..59b59e25 100644 --- a/tests/bundles/xenial-mitaka-namespaced.yaml +++ b/tests/bundles/xenial-mitaka-namespaced.yaml @@ -10,7 +10,7 @@ applications: source: *source namespace-tenants: True ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -19,16 +19,16 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index 92c05a58..a8230cf7 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,16 +18,16 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index 8b910432..9bc72313 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,16 +18,16 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index c9fd580a..bb051552 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,16 +18,16 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index e4fc7a5f..0d0cbd9f 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -9,7 +9,7 @@ applications: options: source: *source ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 constraints: "mem=2048" storage: @@ -18,21 +18,21 @@ applications: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - keystone:shared-db