Remove disco support from the charm

Change-Id: Ia9549a9404f3b5dbc62631817fa6bd3de809b617
This commit is contained in:
Alex Kavanagh 2020-02-18 12:31:50 +00:00
parent 01cb6acc48
commit d38e26e819
3 changed files with 29 additions and 6 deletions

View File

@ -13,7 +13,6 @@ tags:
series:
- xenial
- bionic
- disco
- eoan
- trusty
description: |

View File

@ -1,39 +1,49 @@
series: disco
series: eoan
applications:
ceph-osd:
series: disco
charm: ceph-osd
num_units: 3
series: eoan
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/srv/ceph /dev/test-non-existent'
osd-devices: '/dev/test-non-existent'
source: cloud:eoan-train
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
monitor-count: '3'
auth-supported: 'none'
source: cloud:eoan-train
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
source: cloud:eoan-train
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: cloud:eoan-train
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:eoan-train
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: cloud:eoan-train
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:eoan-train
cinder:
expose: True
charm: cs:~openstack-charmers-next/cinder
@ -41,12 +51,20 @@ applications:
options:
block-device: 'None'
glance-api-version: '2'
openstack-origin: cloud:eoan-train
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:eoan-train
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
options:
openstack-origin: cloud:eoan-train
relations:
- - nova-compute:amqp
- rabbitmq-server:amqp
@ -88,3 +106,9 @@ relations:
- nova-compute:cloud-compute
- - nova-cloud-controller:image-service
- glance:image-service
- - placement
- percona-cluster
- - placement
- keystone
- - placement
- nova-cloud-controller

View File

@ -12,7 +12,7 @@ gate_bundles:
smoke_bundles:
- bionic-train
dev_bundles:
- disco-stein
- eoan-train
configure:
- zaza.openstack.charm_tests.glance.setup.add_lts_image
tests: