openstack
/
charm-ceph-osd
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch amulet tests to stable.

Switch to using stable charm-helpers branch.

Change-Id: I2915f5b7b31752a6c79027c9b1a73e6ac1e93ed1
This commit is contained in:
David Ames 2019-10-24 12:22:18 -07:00
parent 4c21a984c6
commit 578770acec
11 changed files with 75 additions and 73 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-osd.git
defaultbranch=stable/19.10

2
Makefile
View File

@ -25,7 +25,7 @@ ch-sync: bin/charm_helpers_sync.py
$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
ceph-sync: bin/git_sync.py
$(PYTHON) bin/git_sync.py -d lib -s https://github.com/openstack/charms.ceph.git
$(PYTHON) bin/git_sync.py -d lib -b stable/19.10 -s https://github.com/openstack/charms.ceph.git
sync: ch-sync

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

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

@ -10,54 +10,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

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

@ -10,54 +10,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

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

@ -9,43 +9,43 @@ applications:
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:
- - nova-compute:amqp

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

@ -14,7 +14,7 @@ applications:
constraints:
virt-type=kvm
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:ceph-mon
num_units: 3
options:
monitor-count: '3'
@ -36,7 +36,7 @@ applications:
constraints:
virt-type=kvm
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: cloud:trusty-mitaka
@ -46,7 +46,7 @@ applications:
virt-type=kvm
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
@ -55,7 +55,7 @@ applications:
constraints:
virt-type=kvm
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
@ -65,7 +65,7 @@ applications:
virt-type=kvm
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
@ -75,7 +75,7 @@ applications:
virt-type=kvm
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: 'None'
@ -86,10 +86,10 @@ applications:
constraints:
virt-type=kvm
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:trusty-mitaka

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

@ -9,43 +9,43 @@ applications:
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:
- - nova-compute:amqp

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

@ -10,54 +10,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

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

@ -10,54 +10,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

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

@ -10,54 +10,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