Enable focal and ussuri for the charm
The charm requires a bundle force override for the focal bundle. This patch adds test bundles for bionic-ussuri and focal-ussuri to the charm. Change-Id: I6e6cbb30fe7b525a49b7c79181b5aaeb2e129cca
This commit is contained in:
parent
c4eaed25f2
commit
82448485b8
|
@ -19,6 +19,7 @@ series:
|
||||||
- xenial
|
- xenial
|
||||||
- bionic
|
- bionic
|
||||||
- eoan
|
- eoan
|
||||||
|
- focal
|
||||||
- trusty
|
- trusty
|
||||||
extra-bindings:
|
extra-bindings:
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -0,0 +1,113 @@
|
||||||
|
series: bionic
|
||||||
|
relations:
|
||||||
|
- - nova-compute:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-compute:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - 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
|
||||||
|
- - keystone:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - glance:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - glance:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - glance:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - neutron-gateway:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:quantum-network-service
|
||||||
|
- neutron-gateway:quantum-network-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:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - nova-compute:neutron-plugin
|
||||||
|
- neutron-openvswitch:neutron-plugin
|
||||||
|
- - rabbitmq-server:amqp
|
||||||
|
- neutron-openvswitch:amqp
|
||||||
|
- - placement:shared-db
|
||||||
|
- percona-cluster:shared-db
|
||||||
|
- - placement:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - placement:placement
|
||||||
|
- nova-cloud-controller:placement
|
||||||
|
applications:
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
max-connections: 1000
|
||||||
|
innodb-buffer-pool-size: 256M
|
||||||
|
dataset-size: 25%
|
||||||
|
root-password: ChangeMe123
|
||||||
|
sst-password: ChangeMe123
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: ../../../nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
|
||||||
|
network-manager: Neutron
|
||||||
|
vendor-data: '{"some": "json data"}'
|
||||||
|
vendor-data-url: http://some.url/vdata
|
||||||
|
debug: true
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||||
|
placement:
|
||||||
|
charm: cs:~openstack-charmers-next/placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
constraints: mem=4G cores=4
|
||||||
|
options:
|
||||||
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
config-flags: auto_assign_floating_ip=False
|
||||||
|
enable-live-migration: false
|
||||||
|
aa-profile-mode: enforce
|
||||||
|
ephemeral-device: /dev/vdb
|
||||||
|
ephemeral-unmount: /mnt
|
||||||
|
debug: true
|
|
@ -0,0 +1,210 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin 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':
|
||||||
|
# machines 10 and 11 are for nova-compute which needs more memory for the
|
||||||
|
# instances.
|
||||||
|
'10':
|
||||||
|
constraints: mem=4096M cores=4
|
||||||
|
'11':
|
||||||
|
constraints: mem=4096M cores=4
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
nova-cloud-controller-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
glance-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
neutron-api-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
placement-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: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
- '1'
|
||||||
|
- '2'
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: ../../../nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
|
||||||
|
network-manager: Neutron
|
||||||
|
vendor-data: '{"some": "json data"}'
|
||||||
|
vendor-data-url: http://some.url/vdata
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: cs:~openstack-charmers-next/placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '9'
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
storage:
|
||||||
|
ephemeral-device: '40G'
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
config-flags: auto_assign_floating_ip=False
|
||||||
|
enable-live-migration: false
|
||||||
|
aa-profile-mode: enforce
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '10'
|
||||||
|
- '11'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||||
|
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - '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'
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-gateway:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
||||||
|
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'neutron-api-mysql-router:shared-db'
|
||||||
|
- - 'neutron-api-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
|
||||||
|
- - 'rabbitmq-server:amqp'
|
||||||
|
- 'neutron-openvswitch:amqp'
|
||||||
|
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'placement-mysql-router:shared-db'
|
||||||
|
- - 'placement-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'placement:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'placement:placement'
|
||||||
|
- 'nova-cloud-controller:placement'
|
|
@ -1,7 +1,9 @@
|
||||||
charm_name: nova-cloud-controller
|
charm_name: nova-cloud-controller
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train
|
- bionic-ussuri
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
|
- focal-ussuri
|
||||||
|
- bionic-ussuri
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- bionic-stein
|
- bionic-stein
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
|
@ -22,3 +24,6 @@ tests:
|
||||||
- zaza.openstack.charm_tests.nova.tests.CirrosGuestCreateTest
|
- zaza.openstack.charm_tests.nova.tests.CirrosGuestCreateTest
|
||||||
- zaza.openstack.charm_tests.nova.tests.SecurityTests
|
- zaza.openstack.charm_tests.nova.tests.SecurityTests
|
||||||
- zaza.openstack.charm_tests.nova.tests.NovaCloudController
|
- zaza.openstack.charm_tests.nova.tests.NovaCloudController
|
||||||
|
tests_options:
|
||||||
|
force_deploy:
|
||||||
|
- focal-ussuri
|
||||||
|
|
Loading…
Reference in New Issue