Remove Disco and Eoan bits
Change-Id: I6cff076fd856020a4a438c9729fa7ac4e7a89a0f
This commit is contained in:
parent
b155a50403
commit
e245bd4345
|
@ -12,7 +12,6 @@ tags:
|
||||||
series:
|
series:
|
||||||
- xenial
|
- xenial
|
||||||
- bionic
|
- bionic
|
||||||
- eoan
|
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
- groovy
|
||||||
subordinate: false
|
subordinate: false
|
||||||
|
|
|
@ -1,112 +0,0 @@
|
||||||
series: disco
|
|
||||||
applications:
|
|
||||||
ceph-fs:
|
|
||||||
charm: ceph-fs
|
|
||||||
series: disco
|
|
||||||
num_units: 1
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/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'
|
|
||||||
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
|
|
||||||
glance:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-cloud-controller:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=8G
|
|
||||||
options:
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
relations:
|
|
||||||
- - ceph-mon:mds
|
|
||||||
- ceph-fs:ceph-mds
|
|
||||||
- - 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
|
|
||||||
- - 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
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-api:neutron-api'
|
|
||||||
- 'nova-cloud-controller:neutron-api'
|
|
||||||
- - 'neutron-api:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,127 +0,0 @@
|
||||||
series: eoan
|
|
||||||
applications:
|
|
||||||
ceph-fs:
|
|
||||||
charm: ceph-fs
|
|
||||||
series: eoan
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:eoan-train/proposed
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: cloud:eoan-train/proposed
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: cloud:eoan-train/proposed
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
dataset-size: 25%
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:eoan-train/proposed
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:eoan-train/proposed
|
|
||||||
keystone:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:eoan-train/proposed
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:eoan-train/proposed
|
|
||||||
glance:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:eoan-train/proposed
|
|
||||||
cinder:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: cloud:eoan-train/proposed
|
|
||||||
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/proposed
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers-next/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:eoan-train
|
|
||||||
relations:
|
|
||||||
- - ceph-mon:mds
|
|
||||||
- ceph-fs:ceph-mds
|
|
||||||
- - 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
|
|
||||||
- - 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
|
|
||||||
- - placement
|
|
||||||
- percona-cluster
|
|
||||||
- - placement
|
|
||||||
- keystone
|
|
||||||
- - placement
|
|
||||||
- nova-cloud-controller
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-api:neutron-api'
|
|
||||||
- 'nova-cloud-controller:neutron-api'
|
|
||||||
- - 'neutron-api:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
Loading…
Reference in New Issue