openstack
/
charm-ceph-proxy
Code Issues Proposed changes

Add glance/nova-compute to bundles 

This is to resolve the associated bug where cinder-ceph has grown the
capability to block if it doesn't have an appropriate relation to
nova-compute.

Also remove the trusty-icehouse bundle as it is not longer supported.
Note, on trusty-mitaka, the nova-cloud-controller is needed as otherwise
nova-compute complains and then dies, leaving a nova-compute service is
not running in the status message.

Also, change the detection of the status messages for the radosgw charm
as it has changed during the dev cycle.

Change-Id: I072b79705a6a7dfb0d5cbd16095e6ececb432ec3
Closes-Bug: #1881246
This commit is contained in:
Alex Kavanagh 2020-06-04 20:40:08 +01:00
parent 65d0de63dc
commit b71f4fd81d
13 changed files with 248 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,12 @@ applications:
glance-api-version: 2
overwrite: "false"
constraints: mem=2048
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
options:
@ -64,4 +70,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

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

@ -43,6 +43,16 @@ applications:
options:
openstack-origin: cloud:bionic-rocky
constraints: mem=1024
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
num_units: 1
@ -77,3 +87,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

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

@ -43,6 +43,16 @@ applications:
options:
openstack-origin: cloud:bionic-stein
constraints: mem=1024
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-stein
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
num_units: 1
@ -77,4 +87,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

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

@ -43,6 +43,16 @@ applications:
options:
openstack-origin: cloud:bionic-train
constraints: mem=1024
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
options:
openstack-origin: cloud:bionic-train
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
num_units: 1
@ -77,4 +87,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

20
tests/bundles/bionic-ussuri.yaml
View File

@ -44,6 +44,16 @@ applications:
openstack-origin: cloud:bionic-ussuri
admin-password: openstack
constraints: mem=1024
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
options:
openstack-origin: cloud:bionic-ussuri
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
num_units: 1
@ -78,3 +88,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

38
tests/bundles/focal-ussuri.yaml
View File

@ -23,11 +23,15 @@ machines:
'11':
'12':
'13':
'14':
'15':
applications:
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
@ -117,6 +121,23 @@ applications:
to:
- '13'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
relations:
- - 'ceph-osd:mon'
@ -146,3 +167,20 @@ relations:
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

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

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

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

@ -33,6 +33,21 @@ applications:
glance-api-version: 2
overwrite: "false"
constraints: mem=2048
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
cinder-ceph:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
options:
@ -77,3 +92,24 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:image-service'
- 'nova-cloud-controller:image-service'
- - 'keystone:identity-service'
- 'nova-cloud-controller:identity-service'
- - 'nova-compute:cloud-compute'
- 'nova-cloud-controller:cloud-compute'
- - 'percona-cluster:shared-db'
- 'nova-cloud-controller:shared-db'
- - 'rabbitmq-server:amqp'
- 'nova-cloud-controller:amqp'

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

@ -32,6 +32,12 @@ applications:
charm: 'cs:~openstack-charmers-next/cinder-ceph'
options:
restrict-ceph-pools: True
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
keystone:
charm: 'cs:~openstack-charmers-next/keystone'
num_units: 1
@ -67,3 +73,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

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

@ -43,6 +43,16 @@ applications:
options:
openstack-origin: cloud:xenial-ocata
constraints: mem=1024
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
num_units: 1
@ -77,3 +87,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

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

@ -43,6 +43,16 @@ applications:
options:
openstack-origin: cloud:xenial-pike
constraints: mem=1024
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-pike
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
num_units: 1
@ -77,3 +87,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

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

@ -43,6 +43,16 @@ applications:
options:
openstack-origin: cloud:xenial-queens
constraints: mem=1024
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-queens
percona-cluster:
charm: 'cs:~openstack-charmers-next/percona-cluster'
num_units: 1
@ -77,3 +87,13 @@ relations:
- 'cinder:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-proxy:client'
- - 'glance:image-service'
- 'nova-compute:image-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'

9
tests/tests.yaml
View File

@ -19,12 +19,7 @@ gate_bundles:
dev_bundles:
# Icehouse
- trusty-icehouse
- trusty-juno
# Hammer
- trusty-kilo
- trusty-liberty
# Jewel
- xenial-newton
- xenial-ocata
# Pike
- xenial-pike
@ -36,8 +31,8 @@ target_deploy_status:
workload-status: blocked
workload-status-message: Ensure FSID and admin-key are set
ceph-radosgw:
workload-status: blocked
workload-status-message: "Missing relations: mon"
workload-status: waiting
workload-status-message: "Incomplete relations: mon"
cinder-ceph:
workload-status: waiting
workload-status-message: "Incomplete relations: ceph"