Add focal and ussuri bundles to the charm
This patch updates the bundles to include up to focal-ussuri. The focal-ussuri bundle is in the dev bundles as it can't pass at the moment due to LP: #1865754. The bionic-ussuri bundle is in the dev bundles (i.e. not gate) as it fails due to LP: #1892201 Also deal with the related bug where cinder-ceph requires the relation with a nova-compute unit. Related-Bug: #1881246 Related-Bug: #1865754 Related-Bug: #1892201 Change-Id: I0a6f1de82ecc601509822277d657485e08dc893d
This commit is contained in:
Alex Kavanagh
parent
206700b083
commit
5199c76713
|
|
@ -0,0 +1,113 @@
|
|||
series: bionic
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-train
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-train
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers-next/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
glance-api-version: 2
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||
num_units: 0
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 1
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: cloud:bionic-train
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: cloud:bionic-train
|
||||
#bluestore: False
|
||||
#use-direct-io: False
|
||||
storage:
|
||||
osd-devices: '10G'
|
||||
ceph-rbd-mirror:
|
||||
series: bionic
|
||||
charm: ../../../ceph-rbd-mirror
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-train
|
||||
ceph-mon-b:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: cloud:bionic-train
|
||||
ceph-osd-b:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: cloud:bionic-train
|
||||
#bluestore: False
|
||||
#use-direct-io: False
|
||||
storage:
|
||||
osd-devices: '10G'
|
||||
ceph-rbd-mirror-b:
|
||||
series: bionic
|
||||
charm: ../../../ceph-rbd-mirror
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-train
|
||||
relations:
|
||||
- - mysql
|
||||
- keystone
|
||||
- - mysql
|
||||
- cinder
|
||||
- - mysql
|
||||
- glance
|
||||
- - rabbitmq-server
|
||||
- cinder
|
||||
- - keystone
|
||||
- cinder
|
||||
- - keystone
|
||||
- glance
|
||||
- - cinder
|
||||
- cinder-ceph
|
||||
- - cinder-ceph
|
||||
- ceph-mon
|
||||
- - nova-compute:ceph-access
|
||||
- cinder-ceph:ceph-access
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance
|
||||
- ceph-mon
|
||||
- - ceph-mon:osd
|
||||
- ceph-osd:mon
|
||||
- - ceph-mon
|
||||
- ceph-rbd-mirror:ceph-local
|
||||
- - ceph-mon
|
||||
- ceph-rbd-mirror-b:ceph-remote
|
||||
- - ceph-mon-b:osd
|
||||
- ceph-osd-b:mon
|
||||
- - ceph-mon-b
|
||||
- ceph-rbd-mirror-b:ceph-local
|
||||
- - ceph-mon-b
|
||||
- ceph-rbd-mirror:ceph-remote
|
||||
|
|
@ -0,0 +1,113 @@
|
|||
series: bionic
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-ussuri
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-ussuri
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers-next/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
glance-api-version: 2
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||
num_units: 0
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 1
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: cloud:bionic-ussuri
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: cloud:bionic-ussuri
|
||||
#bluestore: False
|
||||
#use-direct-io: False
|
||||
storage:
|
||||
osd-devices: '10G'
|
||||
ceph-rbd-mirror:
|
||||
series: bionic
|
||||
charm: ../../../ceph-rbd-mirror
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-ussuri
|
||||
ceph-mon-b:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: cloud:bionic-ussuri
|
||||
ceph-osd-b:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: cloud:bionic-ussuri
|
||||
#bluestore: False
|
||||
#use-direct-io: False
|
||||
storage:
|
||||
osd-devices: '10G'
|
||||
ceph-rbd-mirror-b:
|
||||
series: bionic
|
||||
charm: ../../../ceph-rbd-mirror
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-ussuri
|
||||
relations:
|
||||
- - mysql
|
||||
- keystone
|
||||
- - mysql
|
||||
- cinder
|
||||
- - mysql
|
||||
- glance
|
||||
- - rabbitmq-server
|
||||
- cinder
|
||||
- - keystone
|
||||
- cinder
|
||||
- - keystone
|
||||
- glance
|
||||
- - cinder
|
||||
- cinder-ceph
|
||||
- - cinder-ceph
|
||||
- ceph-mon
|
||||
- - nova-compute:ceph-access
|
||||
- cinder-ceph:ceph-access
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance
|
||||
- ceph-mon
|
||||
- - ceph-mon:osd
|
||||
- ceph-osd:mon
|
||||
- - ceph-mon
|
||||
- ceph-rbd-mirror:ceph-local
|
||||
- - ceph-mon
|
||||
- ceph-rbd-mirror-b:ceph-remote
|
||||
- - ceph-mon-b:osd
|
||||
- ceph-osd-b:mon
|
||||
- - ceph-mon-b
|
||||
- ceph-rbd-mirror-b:ceph-local
|
||||
- - ceph-mon-b
|
||||
- ceph-rbd-mirror:ceph-remote
|
||||
|
|
@ -0,0 +1,228 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
'14':
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
'20':
|
||||
'21':
|
||||
|
||||
applications:
|
||||
|
||||
cinder-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers-next/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
glance-api-version: 2
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||
num_units: 0
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 1
|
||||
to:
|
||||
- '7'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
#bluestore: False
|
||||
#use-direct-io: False
|
||||
storage:
|
||||
osd-devices: '10G'
|
||||
to:
|
||||
- '11'
|
||||
- '12'
|
||||
- '13'
|
||||
|
||||
ceph-rbd-mirror:
|
||||
series: focal
|
||||
charm: ../../../ceph-rbd-mirror
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
|
||||
ceph-mon-b:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '15'
|
||||
- '16'
|
||||
- '17'
|
||||
|
||||
ceph-osd-b:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
#bluestore: False
|
||||
#use-direct-io: False
|
||||
storage:
|
||||
osd-devices: '10G'
|
||||
to:
|
||||
- '18'
|
||||
- '19'
|
||||
- '20'
|
||||
|
||||
ceph-rbd-mirror-b:
|
||||
series: focal
|
||||
charm: ../../../ceph-rbd-mirror
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '21'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'rabbitmq-server'
|
||||
- 'cinder'
|
||||
|
||||
- - 'keystone'
|
||||
- 'cinder'
|
||||
|
||||
- - 'keystone'
|
||||
- 'glance'
|
||||
|
||||
- - 'cinder'
|
||||
- 'cinder-ceph'
|
||||
|
||||
- - 'cinder-ceph'
|
||||
- 'ceph-mon'
|
||||
|
||||
- - 'nova-compute:ceph-access'
|
||||
- 'cinder-ceph:ceph-access'
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'glance:image-service'
|
||||
- 'nova-compute:image-service'
|
||||
|
||||
- - 'glance'
|
||||
- 'ceph-mon'
|
||||
|
||||
- - 'ceph-mon:osd'
|
||||
- 'ceph-osd:mon'
|
||||
|
||||
- - 'ceph-mon'
|
||||
- 'ceph-rbd-mirror:ceph-local'
|
||||
|
||||
- - 'ceph-mon'
|
||||
- 'ceph-rbd-mirror-b:ceph-remote'
|
||||
|
||||
- - 'ceph-mon-b:osd'
|
||||
- 'ceph-osd-b:mon'
|
||||
|
||||
- - 'ceph-mon-b'
|
||||
- 'ceph-rbd-mirror-b:ceph-local'
|
||||
|
||||
- - 'ceph-mon-b'
|
||||
- 'ceph-rbd-mirror:ceph-remote'
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
charm_name: ceph-rbd-mirror
|
||||
smoke_bundles:
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
gate_bundles:
|
||||
- bionic-train
|
||||
- bionic-stein
|
||||
- bionic-rocky
|
||||
- bionic-queens
|
||||
|
|
@ -15,9 +16,14 @@ dev_bundles:
|
|||
- focal-victoria
|
||||
- bionic-queens-e2e
|
||||
- bionic-queens-e2e-lxd
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.ceph.rbd_mirror.tests.CephRBDMirrorTest
|
||||
- zaza.openstack.charm_tests.ceph.rbd_mirror.tests.CephRBDMirrorControlledFailoverTest
|
||||
- zaza.openstack.charm_tests.ceph.rbd_mirror.tests.CephRBDMirrorDisasterFailoverTest
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- groovy-victoria
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
|
||||
psutil
|
||||
|
|
|
|||
Loading…
Reference in New Issue