openstack
/
charm-glance-simplestreams-sync
Code Issues Proposed changes

Merge "Test using Ceph RADOS Gateway"

This commit is contained in:
Zuul 2020-07-03 11:21:21 +00:00 committed by Gerrit Code Review
parent ace272bd7c 4925c3573b
commit 5766fcbbc2
8 changed files with 363 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,16 @@ machines:
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
@ -19,6 +29,10 @@ relations:
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
@ -44,7 +58,26 @@ applications:
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
to:
- '9'
- '10'
- '11'

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

@ -1,3 +1,6 @@
options:
source: &source cloud:bionic-rocky
series: bionic
comment:
@ -9,6 +12,16 @@ machines:
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
@ -19,6 +32,10 @@ relations:
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
@ -32,23 +49,49 @@ applications:
to:
- '1'
keystone:
series: bionic
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

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

@ -1,3 +1,6 @@
options:
source: &source cloud:bionic-stein
series: bionic
comment:
@ -9,6 +12,16 @@ machines:
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
@ -19,6 +32,10 @@ relations:
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
@ -36,20 +53,45 @@ applications:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

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

@ -1,3 +1,6 @@
options:
source: &source cloud:bionic-train
series: bionic
comment:
@ -9,6 +12,16 @@ machines:
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
@ -19,6 +32,10 @@ relations:
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
@ -36,20 +53,45 @@ applications:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-train
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

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

@ -1,3 +1,6 @@
options:
source: &source cloud:bionic-ussuri
series: bionic
comment:
@ -9,6 +12,16 @@ machines:
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
@ -19,6 +32,10 @@ relations:
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
@ -36,20 +53,45 @@ applications:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

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

@ -1,5 +1,5 @@
variables:
openstack-origin: &openstack-origin distro
source: &source distro
series: focal
@ -14,6 +14,17 @@ machines:
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
@ -28,7 +39,7 @@ applications:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
source: *source
to:
- '0'
- '1'
@ -44,7 +55,7 @@ applications:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
openstack-origin: *source
to:
- '4'
@ -52,18 +63,46 @@ applications:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
@ -76,3 +115,7 @@ relations:
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-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']
- ['ceph-radosgw:certificates', 'vault:certificates']

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

@ -1,3 +1,6 @@
options:
source: &source distro
series: xenial
comment:
@ -9,6 +12,16 @@ machines:
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
@ -19,6 +32,10 @@ relations:
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
@ -34,17 +51,46 @@ applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

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

@ -1,3 +1,6 @@
options:
source: &source cloud:xenial-queens
series: xenial
comment:
@ -9,6 +12,16 @@ machines:
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
@ -19,6 +32,10 @@ relations:
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
@ -35,20 +52,45 @@ applications:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
options:
use_swift: False
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'