Enable bionic/stein and disco/stein functional tests
Also fixes the bionic/rocky and cosmic/rocy bundles. Move cosmic/rocky and disco/stein to dev_bundles. Change-Id: I77b6aa2b5fba921c4735a86028e9e7c8b09ff40a
This commit is contained in:
parent
506d5e9bf9
commit
370401bb7e
|
@ -8,43 +8,43 @@ applications:
|
||||||
osd-devices: 'cinder,10G'
|
osd-devices: 'cinder,10G'
|
||||||
options:
|
options:
|
||||||
osd-devices: '/srv/ceph /dev/test-non-existent'
|
osd-devices: '/srv/ceph /dev/test-non-existent'
|
||||||
source: cloud:bionic-updates/rocky
|
source: cloud:bionic-rocky
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
charm: cs:~openstack-charmers-next/ceph-mon
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
monitor-count: '3'
|
monitor-count: '3'
|
||||||
auth-supported: 'none'
|
auth-supported: 'none'
|
||||||
source: cloud:bionic-updates/rocky
|
source: cloud:bionic-rocky
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
dataset-size: 25%
|
dataset-size: 25%
|
||||||
max-connections: 1000
|
max-connections: 1000
|
||||||
source: cloud:bionic-updates/rocky
|
source: cloud:bionic-rocky
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
source: cloud:bionic-updates/rocky
|
source: cloud:bionic-rocky
|
||||||
keystone:
|
keystone:
|
||||||
expose: True
|
expose: True
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
openstack-origin: cloud:bionic-rocky
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
openstack-origin: cloud:bionic-rocky
|
||||||
glance:
|
glance:
|
||||||
expose: True
|
expose: True
|
||||||
charm: cs:~openstack-charmers-next/glance
|
charm: cs:~openstack-charmers-next/glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
openstack-origin: cloud:bionic-rocky
|
||||||
cinder:
|
cinder:
|
||||||
expose: True
|
expose: True
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
charm: cs:~openstack-charmers-next/cinder
|
||||||
|
@ -52,7 +52,7 @@ applications:
|
||||||
options:
|
options:
|
||||||
block-device: 'None'
|
block-device: 'None'
|
||||||
glance-api-version: '2'
|
glance-api-version: '2'
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
openstack-origin: cloud:bionic-rocky
|
||||||
cinder-ceph:
|
cinder-ceph:
|
||||||
charm: cs:~openstack-charmers-next/cinder-ceph
|
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
|
@ -60,7 +60,7 @@ applications:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
openstack-origin: cloud:bionic-rocky
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
- rabbitmq-server:amqp
|
- rabbitmq-server:amqp
|
||||||
|
|
|
@ -0,0 +1,104 @@
|
||||||
|
series: bionic
|
||||||
|
applications:
|
||||||
|
ceph-osd:
|
||||||
|
charm: ceph-osd
|
||||||
|
num_units: 3
|
||||||
|
series: bionic
|
||||||
|
storage:
|
||||||
|
osd-devices: 'cinder,10G'
|
||||||
|
options:
|
||||||
|
osd-devices: '/srv/ceph /dev/test-non-existent'
|
||||||
|
source: cloud:bionic-stein
|
||||||
|
ceph-mon:
|
||||||
|
charm: cs:~openstack-charmers-next/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
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
dataset-size: 25%
|
||||||
|
max-connections: 1000
|
||||||
|
source: cloud:bionic-stein
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: cloud:bionic-stein
|
||||||
|
keystone:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
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
|
||||||
|
glance:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-stein
|
||||||
|
cinder:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/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
|
||||||
|
nova-cloud-controller:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-stein
|
||||||
|
relations:
|
||||||
|
- - nova-compute:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-compute:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-compute:ceph
|
||||||
|
- ceph-mon:client
|
||||||
|
- - keystone:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - glance:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - glance:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - glance:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - glance:ceph
|
||||||
|
- ceph-mon:client
|
||||||
|
- - cinder:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - cinder:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - cinder:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - cinder:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - cinder-ceph:storage-backend
|
||||||
|
- cinder:storage-backend
|
||||||
|
- - cinder-ceph:ceph
|
||||||
|
- ceph-mon:client
|
||||||
|
- - ceph-osd:mon
|
||||||
|
- ceph-mon:osd
|
||||||
|
- - nova-cloud-controller:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - nova-cloud-controller:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - nova-cloud-controller:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:cloud-compute
|
||||||
|
- nova-compute:cloud-compute
|
||||||
|
- - nova-cloud-controller:image-service
|
||||||
|
- glance:image-service
|
|
@ -1,9 +1,9 @@
|
||||||
series: cosmic
|
series: cosmic
|
||||||
applications:
|
applications:
|
||||||
ceph-osd:
|
ceph-osd:
|
||||||
|
series: cosmic
|
||||||
charm: ceph-osd
|
charm: ceph-osd
|
||||||
num_units: 3
|
num_units: 3
|
||||||
series: cosmic
|
|
||||||
storage:
|
storage:
|
||||||
osd-devices: 'cinder,10G'
|
osd-devices: 'cinder,10G'
|
||||||
options:
|
options:
|
||||||
|
@ -27,19 +27,13 @@ applications:
|
||||||
expose: True
|
expose: True
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
|
||||||
glance:
|
glance:
|
||||||
expose: True
|
expose: True
|
||||||
charm: cs:~openstack-charmers-next/glance
|
charm: cs:~openstack-charmers-next/glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
|
||||||
cinder:
|
cinder:
|
||||||
expose: True
|
expose: True
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
charm: cs:~openstack-charmers-next/cinder
|
||||||
|
@ -47,15 +41,12 @@ applications:
|
||||||
options:
|
options:
|
||||||
block-device: 'None'
|
block-device: 'None'
|
||||||
glance-api-version: '2'
|
glance-api-version: '2'
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
|
||||||
cinder-ceph:
|
cinder-ceph:
|
||||||
charm: cs:~openstack-charmers-next/cinder-ceph
|
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
expose: True
|
expose: True
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
- rabbitmq-server:amqp
|
- rabbitmq-server:amqp
|
||||||
|
|
|
@ -0,0 +1,90 @@
|
||||||
|
series: disco
|
||||||
|
applications:
|
||||||
|
ceph-osd:
|
||||||
|
series: disco
|
||||||
|
charm: ceph-osd
|
||||||
|
num_units: 3
|
||||||
|
storage:
|
||||||
|
osd-devices: 'cinder,10G'
|
||||||
|
options:
|
||||||
|
osd-devices: '/srv/ceph /dev/test-non-existent'
|
||||||
|
ceph-mon:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-mon
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
monitor-count: '3'
|
||||||
|
auth-supported: 'none'
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
dataset-size: 25%
|
||||||
|
max-connections: 1000
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
keystone:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 1
|
||||||
|
glance:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
cinder:
|
||||||
|
expose: True
|
||||||
|
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
|
||||||
|
nova-cloud-controller:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
relations:
|
||||||
|
- - nova-compute:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-compute:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-compute:ceph
|
||||||
|
- ceph-mon:client
|
||||||
|
- - keystone:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - glance:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - glance:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - glance:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - glance:ceph
|
||||||
|
- ceph-mon:client
|
||||||
|
- - cinder:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - cinder:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - cinder:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - cinder:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - cinder-ceph:storage-backend
|
||||||
|
- cinder:storage-backend
|
||||||
|
- - cinder-ceph:ceph
|
||||||
|
- ceph-mon:client
|
||||||
|
- - ceph-osd:mon
|
||||||
|
- ceph-mon:osd
|
||||||
|
- - nova-cloud-controller:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - nova-cloud-controller:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - nova-cloud-controller:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:cloud-compute
|
||||||
|
- nova-compute:cloud-compute
|
||||||
|
- - nova-cloud-controller:image-service
|
||||||
|
- glance:image-service
|
|
@ -1,16 +1,18 @@
|
||||||
charm_name: ceph-osd
|
charm_name: ceph-osd
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- trusty-mitaka
|
- bionic-stein
|
||||||
- xenial-mitaka
|
- bionic-rocky
|
||||||
- xenial-ocata
|
|
||||||
- xenial-pike
|
|
||||||
- xenial-queens
|
|
||||||
- bionic-queens
|
- bionic-queens
|
||||||
|
- xenial-queens
|
||||||
|
- xenial-pike
|
||||||
|
- xenial-ocata
|
||||||
|
- xenial-mitaka
|
||||||
|
- trusty-mitaka
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-queens
|
- bionic-queens
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- bionic-rocky
|
|
||||||
- cosmic-rocky
|
- cosmic-rocky
|
||||||
|
- disco-stein
|
||||||
configure:
|
configure:
|
||||||
- zaza.charm_tests.glance.setup.add_lts_image
|
- zaza.charm_tests.glance.setup.add_lts_image
|
||||||
tests:
|
tests:
|
||||||
|
|
Loading…
Reference in New Issue