Test bundles for focal-wallaby and hirsute-wallaby
These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. hisute-wallaby test is disabled (moved to dev) due to [1]. [1] https://github.com/juju-solutions/layer-basic/issues/194 Change-Id: I1ee4a15c2ac3b9d1644ed52a2654b3018cd68b50
This commit is contained in:
parent
50ab2b6c54
commit
26dc99fd37
|
@ -7,7 +7,10 @@
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- focal-ussuri
|
- focal-ussuri
|
||||||
- focal-victoria
|
- focal-victoria
|
||||||
|
- focal-wallaby
|
||||||
- groovy-victoria
|
- groovy-victoria
|
||||||
|
# disabled due to layer-basic issue; we'll get re-enabled shortly.
|
||||||
|
#- hirsute-wallaby
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: placement
|
charm_build_name: placement
|
|
@ -0,0 +1,239 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||||
|
|
||||||
|
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':
|
||||||
|
'10':
|
||||||
|
'11':
|
||||||
|
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
nova-cloud-controller-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
|
||||||
|
vault-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
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
admin-password: openstack
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||||
|
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
network-manager: Neutron
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '9'
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: ../../../placement
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '10'
|
||||||
|
|
||||||
|
vault:
|
||||||
|
num_units: 1
|
||||||
|
charm: cs:~openstack-charmers-next/vault
|
||||||
|
to:
|
||||||
|
- '11'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - '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:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller'
|
||||||
|
- 'glance'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'glance'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'glance'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-gateway'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'neutron-gateway:amqp'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'neutron-api-mysql-router:shared-db'
|
||||||
|
- - 'neutron-api-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'neutron-openvswitch'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'neutron-gateway'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch'
|
||||||
|
- 'nova-compute'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'placement-mysql-router:shared-db'
|
||||||
|
- - 'placement-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'vault:shared-db'
|
||||||
|
- 'vault-mysql-router:shared-db'
|
||||||
|
- - 'vault-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'keystone:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'placement:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'neutron-api:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'glance:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'nova-cloud-controller:certificates'
|
|
@ -0,0 +1,239 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
series: hirsute
|
||||||
|
|
||||||
|
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':
|
||||||
|
'10':
|
||||||
|
'11':
|
||||||
|
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
nova-cloud-controller-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
|
||||||
|
vault-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
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
admin-password: openstack
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||||
|
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
network-manager: Neutron
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '9'
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: ../../../placement
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '10'
|
||||||
|
|
||||||
|
vault:
|
||||||
|
num_units: 1
|
||||||
|
charm: cs:~openstack-charmers-next/vault
|
||||||
|
to:
|
||||||
|
- '11'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - '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:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller'
|
||||||
|
- 'glance'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'glance'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'glance'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-gateway'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'neutron-gateway:amqp'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'neutron-api-mysql-router:shared-db'
|
||||||
|
- - 'neutron-api-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'neutron-openvswitch'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'neutron-gateway'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch'
|
||||||
|
- 'nova-compute'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'placement-mysql-router:shared-db'
|
||||||
|
- - 'placement-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'vault:shared-db'
|
||||||
|
- 'vault-mysql-router:shared-db'
|
||||||
|
- - 'vault-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'keystone:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'placement:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'neutron-api:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'glance:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'nova-cloud-controller:certificates'
|
|
@ -1,10 +1,13 @@
|
||||||
charm_name: placement
|
charm_name: placement
|
||||||
|
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
vault:
|
vault:
|
||||||
workload-status: blocked
|
workload-status: blocked
|
||||||
workload-status-message: Vault needs to be initialized
|
workload-status-message: Vault needs to be initialized
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.nova.tests.CirrosGuestCreateTest
|
- zaza.openstack.charm_tests.nova.tests.CirrosGuestCreateTest
|
||||||
|
|
||||||
configure:
|
configure:
|
||||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||||
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
||||||
|
@ -12,14 +15,21 @@ configure:
|
||||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||||
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
||||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- focal-ussuri
|
- focal-ussuri
|
||||||
- focal-victoria
|
- focal-victoria
|
||||||
|
- focal-wallaby
|
||||||
- groovy-victoria
|
- groovy-victoria
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train
|
- bionic-train
|
||||||
|
|
||||||
|
dev_bundles:
|
||||||
|
- hirsute-wallaby
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- groovy-victoria
|
- hirsute-wallaby
|
||||||
|
|
Loading…
Reference in New Issue