openstack/charm-ceph-fs
Code Issues Proposed changes

Updates for stable branch creation

Browse Source 
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: I1b2ad93253e572f7964c590b1b44730bc2d88b98
This commit is contained in:
Liam Young 2020-02-17 15:42:44 +00:00
parent c8e4997e1b
commit 1bb65bdf41
11 changed files with 103 additions and 101 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-fs.git
defaultbranch=stable/20.02

20
src/tests/bundles/bionic-queens.yaml
View File

@ -5,50 +5,50 @@ applications:
series: bionic
num_units: 1
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
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:
monitor-count: '3'
auth-supported: 'none'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
relations:
- - ceph-mon:mds

20
src/tests/bundles/bionic-rocky.yaml
View File

@ -7,7 +7,7 @@ applications:
options:
source: cloud:bionic-rocky
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -15,54 +15,54 @@ applications:
osd-devices: '/srv/ceph /dev/test-non-existent'
source: cloud:bionic-rocky
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:bionic-rocky
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-rocky
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: cloud:bionic-rocky
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:bionic-rocky
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: cloud:bionic-rocky

20
src/tests/bundles/bionic-stein.yaml
View File

@ -7,7 +7,7 @@ applications:
options:
source: cloud:bionic-stein
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -15,54 +15,54 @@ applications:
osd-devices: '/srv/ceph /dev/test-non-existent'
source: cloud:bionic-stein
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:bionic-stein
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-stein
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: cloud:bionic-stein
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-stein
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:bionic-stein
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: cloud:bionic-stein

22
src/tests/bundles/bionic-train.yaml
View File

@ -7,7 +7,7 @@ applications:
options:
source: cloud:bionic-train/proposed
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -15,58 +15,58 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-train/proposed
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:ceph-mon
num_units: 3
options:
monitor-count: '3'
source: cloud:bionic-train/proposed
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-train/proposed
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: cloud:bionic-train/proposed
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train/proposed
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-train/proposed
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:bionic-train/proposed
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:bionic-train/proposed
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: cloud:bionic-train/proposed
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
options:
openstack-origin: cloud:bionic-train

20
src/tests/bundles/cosmic-rocky.yaml
View File

@ -5,50 +5,50 @@ applications:
series: cosmic
num_units: 1
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
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:
monitor-count: '3'
auth-supported: 'none'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
relations:
- - ceph-mon:mds

20
src/tests/bundles/disco-stein.yaml
View File

@ -5,50 +5,50 @@ applications:
series: disco
num_units: 1
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
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:
monitor-count: '3'
auth-supported: 'none'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
relations:
- - ceph-mon:mds

20
src/tests/bundles/xenial-mitaka.yaml
View File

@ -5,50 +5,50 @@ applications:
series: xenial
num_units: 1
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
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:
monitor-count: '3'
auth-supported: 'none'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
relations:
- - ceph-mon:mds

20
src/tests/bundles/xenial-ocata.yaml
View File

@ -7,7 +7,7 @@ applications:
options:
source: cloud:xenial-ocata
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -15,54 +15,54 @@ applications:
osd-devices: '/srv/ceph /dev/test-non-existent'
source: cloud:xenial-ocata
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-ocata
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
source: cloud:xenial-ocata
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: cloud:xenial-ocata
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:xenial-ocata
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: cloud:xenial-ocata

20
src/tests/bundles/xenial-pike.yaml
View File

@ -7,7 +7,7 @@ applications:
options:
source: cloud:xenial-pike
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -15,54 +15,54 @@ applications:
osd-devices: '/srv/ceph /dev/test-non-existent'
source: cloud:xenial-pike
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-pike
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
source: cloud:xenial-pike
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: cloud:xenial-pike
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-pike
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:xenial-pike
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: cloud:xenial-pike

20
src/tests/bundles/xenial-queens.yaml
View File

@ -7,7 +7,7 @@ applications:
options:
source: cloud:xenial-queens
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -15,54 +15,54 @@ applications:
osd-devices: '/srv/ceph /dev/test-non-existent'
source: cloud:xenial-queens
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-queens
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
source: cloud:xenial-queens
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: cloud:xenial-queens
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-queens
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:xenial-queens
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:cinder-ceph
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: cloud:xenial-queens