openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch amulet tests to stable.

Switch zaza bundles to stable charms.

Switch to using stable charm-helpers branch.

Change-Id: I542bf73cf1391c17c3018f1c9f209012bc3ae561
This commit is contained in:
Liam Young 2020-02-17 15:43:17 +00:00
parent 2b6997a660
commit 64014df490
18 changed files with 70 additions and 68 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/20.02

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

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: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: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: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:ceph-mon
num_units: 3
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *source

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

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

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: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: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: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:ceph-mon
num_units: 3
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *source

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

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

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

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

8
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: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:ceph-mon
num_units: 3
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *source

8
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: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:ceph-mon
num_units: 3
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *source

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

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