openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

Updates for stable branch creation 

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.

Change-Id: Ib27cfa2fd6935e41a44eab3ae89e6b2154b1a339
This commit is contained in:
Alex Kavanagh 2020-08-13 11:29:06 +01:00
parent 8041b1bb43
commit ef5c007214
26 changed files with 131 additions and 129 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 host=review.opendev.org
port=29418 port=29418
project=openstack/charm-ceph-radosgw.git project=openstack/charm-ceph-radosgw.git
defaultbranch=stable/20.08

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/20.08
destination: hooks/charmhelpers destination: hooks/charmhelpers
include: include:
- core - core

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

@ -13,7 +13,7 @@ applications:
zone: east-1 zone: east-1
region: east-1 region: east-1
east-ceph-osd: east-ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -21,7 +21,7 @@ applications:
options: options:
source: *source source: *source
east-ceph-mon: east-ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -36,7 +36,7 @@ applications:
zone: west-1 zone: west-1
region: west-1 region: west-1
west-ceph-osd: west-ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -44,16 +44,16 @@ applications:
options: options:
source: *source source: *source
west-ceph-mon: west-ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source

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

@ -10,7 +10,7 @@ applications:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -19,22 +19,22 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,22 +18,22 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -13,7 +13,7 @@ applications:
zone: east-1 zone: east-1
region: east-1 region: east-1
east-ceph-osd: east-ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -21,7 +21,7 @@ applications:
options: options:
source: *source source: *source
east-ceph-mon: east-ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -36,7 +36,7 @@ applications:
zone: west-1 zone: west-1
region: west-1 region: west-1
west-ceph-osd: west-ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -44,16 +44,16 @@ applications:
options: options:
source: *source source: *source
west-ceph-mon: west-ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source

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

@ -10,7 +10,7 @@ applications:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -19,22 +19,22 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,22 +18,22 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -10,7 +10,7 @@ applications:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -19,22 +19,22 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,22 +18,22 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -10,7 +10,7 @@ applications:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -19,21 +19,21 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,21 +18,21 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -10,7 +10,7 @@ applications:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -19,21 +19,21 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,21 +18,21 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db

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

@ -25,10 +25,10 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -47,7 +47,7 @@ applications:
- '3' - '3'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -61,7 +61,7 @@ applications:
- '6' - '6'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -72,7 +72,7 @@ applications:
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
@ -80,10 +80,10 @@ applications:
- '10' - '10'
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '11' - '11'

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

@ -25,10 +25,10 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -46,7 +46,7 @@ applications:
- '3' - '3'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -60,7 +60,7 @@ applications:
- '6' - '6'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -71,7 +71,7 @@ applications:
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
@ -79,10 +79,10 @@ applications:
- '10' - '10'
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '11' - '11'

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

@ -25,10 +25,10 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -47,7 +47,7 @@ applications:
- '3' - '3'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -61,7 +61,7 @@ applications:
- '6' - '6'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -72,7 +72,7 @@ applications:
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
@ -80,10 +80,10 @@ applications:
- '10' - '10'
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '11' - '11'

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

@ -25,10 +25,10 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -46,7 +46,7 @@ applications:
- '3' - '3'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -60,7 +60,7 @@ applications:
- '6' - '6'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -71,7 +71,7 @@ applications:
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
@ -79,10 +79,10 @@ applications:
- '10' - '10'
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '11' - '11'

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

@ -25,10 +25,10 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -47,7 +47,7 @@ applications:
- '3' - '3'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -61,7 +61,7 @@ applications:
- '6' - '6'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -72,7 +72,7 @@ applications:
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
@ -80,10 +80,10 @@ applications:
- '10' - '10'
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '11' - '11'

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

@ -25,10 +25,10 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -46,7 +46,7 @@ applications:
- '3' - '3'
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -60,7 +60,7 @@ applications:
- '6' - '6'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -71,7 +71,7 @@ applications:
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
@ -79,10 +79,10 @@ applications:
- '10' - '10'
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '11' - '11'

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,7 +18,7 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
@ -28,7 +28,7 @@ applications:
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source

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

@ -10,7 +10,7 @@ applications:
source: *source source: *source
namespace-tenants: True namespace-tenants: True
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -19,17 +19,17 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,17 +18,17 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,17 +18,17 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,17 +18,17 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source

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

@ -9,7 +9,7 @@ applications:
options: options:
source: *source source: *source
ceph-osd: ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd charm: cs:~openstack-charmers/ceph-osd
num_units: 3 num_units: 3
constraints: "mem=2048" constraints: "mem=2048"
storage: storage:
@ -18,22 +18,22 @@ applications:
source: *source source: *source
osd-devices: '/srv/ceph /dev/test-non-existent' osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon: ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon charm: cs:~openstack-charmers/ceph-mon
num_units: 3 num_units: 3
options: options:
source: *source source: *source
auth-supported: 'none' auth-supported: 'none'
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *source openstack-origin: *source
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
relations: relations:
- - keystone:shared-db - - keystone:shared-db