openstack
/
charm-ceph-proxy
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: Ieeff6a24628b044ae677d6ec891f6a4a492f1cb3
This commit is contained in:
Liam Young 2020-02-17 15:43:09 +00:00
parent 649bdb4683
commit cec9691c89
13 changed files with 85 additions and 83 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-proxy
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: charmhelpers
include:
- core

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

@ -1,12 +1,12 @@
series: bionic
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -14,10 +14,10 @@ applications:
charm: 'ceph-proxy'
num_units: 1
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
block-device: ""
@ -26,18 +26,18 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
admin-password: openstack
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
dataset-size: 50%
@ -47,7 +47,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
relations:

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

@ -1,13 +1,13 @@
series: bionic
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-rocky
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -19,12 +19,12 @@ applications:
options:
source: cloud:bionic-rocky
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
source: cloud:bionic-rocky
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
@ -34,11 +34,11 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
@ -46,7 +46,7 @@ applications:
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
source: cloud:bionic-rocky
@ -57,7 +57,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
options:

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

@ -1,13 +1,13 @@
series: bionic
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-stein
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -19,12 +19,12 @@ applications:
options:
source: cloud:bionic-stein
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
source: cloud:bionic-stein
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
openstack-origin: cloud:bionic-stein
@ -34,11 +34,11 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
openstack-origin: cloud:bionic-stein
@ -46,7 +46,7 @@ applications:
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
source: cloud:bionic-stein
@ -57,7 +57,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
options:

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

@ -1,13 +1,13 @@
series: bionic
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
source: cloud:bionic-train
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -19,12 +19,12 @@ applications:
options:
source: cloud:bionic-train
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
source: cloud:bionic-train
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
openstack-origin: cloud:bionic-train
@ -34,11 +34,11 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
openstack-origin: cloud:bionic-train
@ -46,7 +46,7 @@ applications:
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
source: cloud:bionic-train
@ -57,7 +57,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
options:

16
tests/bundles/disco-stein.yaml
View File

@ -1,12 +1,12 @@
series: disco
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -14,10 +14,10 @@ applications:
charm: 'ceph-proxy'
num_units: 1
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
block-device: ""
@ -26,18 +26,18 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
admin-password: openstack
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
dataset-size: 50%
@ -47,7 +47,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
relations:

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

@ -1,12 +1,12 @@
series: trusty
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -16,7 +16,7 @@ applications:
num_units: 1
options:
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
relations:

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

@ -1,13 +1,13 @@
series: trusty
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
source: cloud:trusty-mitaka
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -19,12 +19,12 @@ applications:
options:
source: cloud:trusty-mitaka
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
source: trusty-mitaka
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
@ -34,11 +34,11 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
admin-password: openstack
@ -57,7 +57,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
options:

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

@ -1,12 +1,12 @@
series: xenial
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -16,11 +16,11 @@ applications:
num_units: 1
options:
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
block-device: ""
@ -29,18 +29,18 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
admin-password: openstack
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
dataset-size: 50%
@ -50,7 +50,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
relations:

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

@ -1,13 +1,13 @@
series: xenial
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
source: cloud:xenial-ocata
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -19,12 +19,12 @@ applications:
options:
source: cloud:xenial-ocata
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
source: xenial-ocata
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
@ -34,11 +34,11 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
@ -46,7 +46,7 @@ applications:
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
source: cloud:xenial-ocata
@ -57,7 +57,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
options:

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

@ -1,13 +1,13 @@
series: bionic
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
source: cloud:xenial-pike
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -19,12 +19,12 @@ applications:
options:
source: cloud:xenial-pike
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
source: xenial-pike
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
openstack-origin: cloud:xenial-pike
@ -34,11 +34,11 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
admin-password: openstack
@ -46,7 +46,7 @@ applications:
openstack-origin: cloud:xenial-pike
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
source: cloud:xenial-pike
@ -57,7 +57,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
options:

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

@ -1,13 +1,13 @@
series: xenial
applications:
ceph-mon:
charm: 'cs:~openstack-charmers-next/ceph-mon'
charm: 'cs:ceph-mon'
num_units: 3
options:
expected-osd-count: 3
source: cloud:xenial-queens
ceph-osd:
charm: 'cs:~openstack-charmers-next/ceph-osd'
charm: 'cs:ceph-osd'
num_units: 3
storage:
osd-devices: 10G
@ -19,12 +19,12 @@ applications:
options:
source: cloud:xenial-queens
ceph-radosgw:
charm: 'cs:~openstack-charmers-next/ceph-radosgw'
charm: 'cs:ceph-radosgw'
num_units: 1
options:
source: cloud:xenial-queens
cinder:
charm: 'cs:~openstack-charmers-next/cinder'
charm: 'cs:cinder'
num_units: 1
options:
openstack-origin: cloud:xenial-queens
@ -34,11 +34,11 @@ applications:
overwrite: "false"
constraints: mem=2048
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
charm: 'cs:cinder-ceph'
options:
restrict-ceph-pools: True
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
charm: 'cs:keystone'
num_units: 1
options:
openstack-origin: cloud:xenial-queens
@ -46,7 +46,7 @@ applications:
admin-token: ubuntutesting
constraints: mem=1024
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
charm: 'cs:percona-cluster'
num_units: 1
options:
source: cloud:xenial-queens
@ -57,7 +57,7 @@ applications:
sst-password: ChangeMe123
constraints: mem=4096
rabbitmq-server:
charm: 'cs:~openstack-charmers-next/rabbitmq-server'
charm: 'cs:rabbitmq-server'
num_units: 1
constraints: mem=1024
options: