Add focal-ussuri and bionic-ussuri bundles

This patch adds the following bundles:

 * tests/bundles/bionic-ussuri-namespaced.yaml
 * tests/bundles/bionic-ussuri.yaml
 * tests/bundles/focal-ussuri-namespaced.yaml
 * tests/bundles/focal-ussuri.yaml

 The focal tests uses the force_deploy option in the tests.yaml

The depends-on is to fix very recent lint errors in charms.ceph with
E741 (very short variable names).

Change-Id: I46445da361e37716b65bf941f687cbd6468ed212
Depends-On: Id92956e52cefed6d3d792dd95fe7091788fb2d1b
This commit is contained in:
Alex Kavanagh 2020-04-02 16:03:26 +01:00
parent 90816e09bf
commit 3dff521036
8 changed files with 287 additions and 3 deletions

View File

@ -119,7 +119,7 @@ def tidydefaults(args):
)
except subprocess.CalledProcessError as cpe:
action_fail('Unable delete default zone and zonegroup'
': {}'.format(zone, cpe.output))
': {} - {}'.format(zone, cpe.output))
# A dictionary of all the defined actions to callables (which take

View File

@ -1481,11 +1481,11 @@ def get_devices(name):
:returns: Set(device names), which are strings
"""
if config(name):
devices = [l.strip() for l in config(name).split(' ')]
devices = [dev.strip() for dev in config(name).split(' ')]
else:
devices = []
storage_ids = storage_list(name)
devices.extend((storage_get('location', s) for s in storage_ids))
devices.extend((storage_get('location', sid) for sid in storage_ids))
devices = filter(os.path.exists, devices)
return set(devices)

View File

@ -16,6 +16,7 @@ series:
- xenial
- bionic
- eoan
- focal
- trusty
extra-bindings:
public:

View File

@ -0,0 +1,43 @@
options:
source: &source cloud:bionic-ussuri
series: bionic
applications:
ceph-radosgw:
charm: ceph-radosgw
series: bionic
num_units: 1
options:
source: *source
namespace-tenants: True
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - keystone:shared-db
- percona-cluster:shared-db
- - ceph-osd:mon
- ceph-mon:osd
- - ceph-radosgw:mon
- ceph-mon:radosgw
- - ceph-radosgw:identity-service
- keystone:identity-service

View File

@ -0,0 +1,42 @@
options:
source: &source cloud:bionic-ussuri
series: bionic
applications:
ceph-radosgw:
charm: ceph-radosgw
series: bionic
num_units: 1
options:
source: *source
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - keystone:shared-db
- percona-cluster:shared-db
- - ceph-osd:mon
- ceph-mon:osd
- - ceph-radosgw:mon
- ceph-mon:radosgw
- - ceph-radosgw:identity-service
- keystone:identity-service

View File

@ -0,0 +1,96 @@
options:
source: &source 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':
applications:
keystone-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: *source
to:
- '0'
- '1'
- '2'
ceph-radosgw:
charm: ceph-radosgw
num_units: 1
options:
source: *source
namespace-tenants: True
to:
- '3'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'

View File

@ -0,0 +1,94 @@
options:
source: &source 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':
applications:
keystone-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: *source
to:
- '0'
- '1'
- '2'
ceph-radosgw:
charm: ceph-radosgw
num_units: 1
options:
source: *source
to:
- '3'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
constraints: "mem=2048"
storage:
osd-devices: 'cinder,10G'
options:
source: *source
osd-devices: '/srv/ceph /dev/test-non-existent'
to:
- '4'
- '5'
- '6'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '7'
- '8'
- '9'
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '10'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
- - 'ceph-radosgw:mon'
- 'ceph-mon:radosgw'
- - 'ceph-radosgw:identity-service'
- 'keystone:identity-service'

View File

@ -1,5 +1,9 @@
charm_name: ceph-radosgw
gate_bundles:
- test-s3api: focal-ussuri
- test-s3api: focal-ussuri-namespaced
- test-s3api: bionic-ussuri
- test-s3api: bionic-ussuri-namespaced
- test-s3api: bionic-train
- test-s3api: bionic-train-namespaced
- test-s3api: bionic-stein
@ -24,3 +28,7 @@ tests:
- test-s3api:
- zaza.openstack.charm_tests.ceph.tests.CephRGWTest
- zaza.openstack.charm_tests.swift.tests.S3APITest
tests_options:
force_deploy:
- focal-ussuri
- focal-ussuri-namespaced