openstack/charm-ceph-radosgw
Code Issues Proposed changes

Updates for stable branch creation 21.01

Browse Source 
Set default branch for git review/gerrit.
Switch tests to stable.
Switch to using stable charm-helpers branch.
Switch to using stable charm.openstack branch.
Switch to using stable zaza branch.
Switch to using stable zaza-openstack-tests branch.

Change-Id: I758636787a93b13df93f5edb7917b6d25b18b2ab
This commit is contained in:
Aurelien Lourot 2021-02-10 20:02:38 +01:00
parent 2d292253ed
commit 09e6b9f95b
28 changed files with 140 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-ceph-radosgw.git
defaultbranch=stable/21.01

2
charm-helpers-hooks.yaml
View File

@ -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

4
test-requirements.txt
View File

@ -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'

12
tests/bundles/bionic-queens-multisite.yaml
View File

@ -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

10
tests/bundles/bionic-queens-namespaced.yaml
View File

@ -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

10
tests/bundles/bionic-queens.yaml
View File

@ -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

12
tests/bundles/bionic-rocky-multisite.yaml
View File

@ -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

10
tests/bundles/bionic-rocky-namespaced.yaml
View File

@ -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

10
tests/bundles/bionic-rocky.yaml
View File

@ -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

10
tests/bundles/bionic-stein-namespaced.yaml
View File

@ -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

10
tests/bundles/bionic-stein.yaml
View File

@ -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

10
tests/bundles/bionic-train-namespaced.yaml
View File

@ -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

10
tests/bundles/bionic-train.yaml
View File

@ -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

10
tests/bundles/bionic-ussuri-namespaced.yaml
View File

@ -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

10
tests/bundles/bionic-ussuri.yaml
View File

@ -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

14
tests/bundles/focal-ussuri-ec.yaml
View File

@ -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'

14
tests/bundles/focal-ussuri-namespaced.yaml
View File

@ -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'

14
tests/bundles/focal-ussuri.yaml
View File

@ -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'

14
tests/bundles/focal-victoria-namespaced.yaml
View File

@ -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'

14
tests/bundles/focal-victoria.yaml
View File

@ -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'

14
tests/bundles/groovy-victoria-namespaced.yaml
View File

@ -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'

14
tests/bundles/groovy-victoria.yaml
View File

@ -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'

6
tests/bundles/trusty-mitaka.yaml
View File

@ -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

8
tests/bundles/xenial-mitaka-namespaced.yaml
View File

@ -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

8
tests/bundles/xenial-mitaka.yaml
View File

@ -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

8
tests/bundles/xenial-ocata.yaml
View File

@ -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

8
tests/bundles/xenial-pike.yaml
View File

@ -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

10
tests/bundles/xenial-queens.yaml
View File

@ -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