openstack
/
charm-cinder-backup
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: I2cce21dadef17d93fa071d78d50d802adcc380be
This commit is contained in:
David Ames 2020-05-21 09:54:28 -07:00
parent 5f23fbe1d3
commit d56212f829
11 changed files with 65 additions and 63 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-cinder-backup.git
defaultbranch=stable/20.05

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

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

@ -20,32 +20,32 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -56,6 +56,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -20,29 +20,29 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:bionic-rocky
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:bionic-rocky
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -50,7 +50,7 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-rocky
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -62,6 +62,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -20,29 +20,29 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:bionic-stein
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:bionic-stein
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -50,7 +50,7 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-stein
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -62,6 +62,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -20,28 +20,28 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:bionic-train
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
source: cloud:bionic-train
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -49,7 +49,7 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:bionic-train
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -61,6 +61,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -27,22 +27,22 @@ applications:
max-connections: 1000
source: cloud:trusty-mitaka
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:trusty-mitaka
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -50,7 +50,7 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:trusty-mitaka
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -62,6 +62,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -20,32 +20,32 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/dev/test-non-existent'
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -56,6 +56,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -20,29 +20,29 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:xenial-ocata
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-ocata
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -50,7 +50,7 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:xenial-ocata
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -62,6 +62,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -20,29 +20,29 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:xenial-pike
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-pike
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -50,7 +50,7 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:xenial-pike
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -62,6 +62,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3

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

@ -20,29 +20,29 @@ relations:
- rabbitmq-server:amqp
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
source: cloud:xenial-queens
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:xenial-queens
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -50,7 +50,7 @@ applications:
osd-devices: '/dev/test-non-existent'
source: cloud:xenial-queens
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: 'None'
@ -62,6 +62,6 @@ applications:
options:
ceph-osd-replication-count: 3
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: cs:~openstack-charmers/cinder-ceph
options:
ceph-osd-replication-count: 3