openstack
/
charm-neutron-openvswitch
Code Issues Proposed changes

21.10 - Release 

Remove the "channel: candidate" from the func-test
bundles.

Change-Id: I6aeca470ac2ecff21c8fb414a82084cf8f776baf
This commit is contained in:
Alex Kavanagh 2021-10-21 14:49:41 +01:00
parent 5317860eeb
commit 0cdac39d74
17 changed files with 0 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/bundles/bionic-queens-dvr-snat.yaml
View File

@ -26,7 +26,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -34,7 +33,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -48,7 +46,6 @@ applications:
enable-dvr: True
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -56,7 +53,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -64,7 +60,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -79,7 +74,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -92,7 +86,6 @@ applications:
to:
- '6'
- '7'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

7
tests/bundles/bionic-rocky-dvr-snat.yaml
View File

@ -26,7 +26,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -34,7 +33,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -48,7 +46,6 @@ applications:
enable-dvr: True
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -56,7 +53,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -64,7 +60,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -79,7 +74,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -92,7 +86,6 @@ applications:
to:
- '6'
- '7'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

7
tests/bundles/bionic-stein-dvr-snat.yaml
View File

@ -26,7 +26,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -34,7 +33,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -48,7 +46,6 @@ applications:
enable-dvr: True
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -56,7 +53,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -64,7 +60,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -79,7 +74,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -92,7 +86,6 @@ applications:
to:
- '6'
- '7'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

8
tests/bundles/bionic-train-dvr-snat.yaml
View File

@ -27,7 +27,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -35,7 +34,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -49,7 +47,6 @@ applications:
enable-dvr: True
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -57,7 +54,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -65,7 +61,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -80,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -93,7 +87,6 @@ applications:
to:
- '6'
- '7'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -101,7 +94,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

8
tests/bundles/bionic-ussuri-dvr-snat.yaml
View File

@ -27,7 +27,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -35,7 +34,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -50,7 +48,6 @@ applications:
enable-dvr: True
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -58,7 +55,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -66,7 +62,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -81,7 +76,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -94,7 +88,6 @@ applications:
to:
- '6'
- '7'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -102,7 +95,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

19
tests/bundles/focal-ussuri-dvr-snat.yaml
View File

@ -28,22 +28,16 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
@ -53,7 +47,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -61,7 +54,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -76,7 +68,6 @@ applications:
enable-dvr: True
to:
- '4'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -84,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -92,7 +82,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -107,7 +96,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -120,7 +108,6 @@ applications:
to:
- '8'
- '9'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -128,16 +115,13 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '11'
channel: candidate
ovn-central:
charm: cs:~openstack-charmers/ovn-central
num_units: 3
@ -145,16 +129,13 @@ applications:
source: *openstack-origin
to:
- '12'
channel: candidate
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
channel: candidate
ovn-chassis:
charm: cs:~openstack-charmers/ovn-chassis
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: candidate
relations:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

19
tests/bundles/focal-victoria-dvr-snat.yaml
View File

@ -28,22 +28,16 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
@ -53,7 +47,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -61,7 +54,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -76,7 +68,6 @@ applications:
enable-dvr: True
to:
- '4'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -84,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -92,7 +82,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -107,7 +96,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -120,7 +108,6 @@ applications:
to:
- '8'
- '9'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -128,16 +115,13 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '11'
channel: candidate
ovn-central:
charm: cs:~openstack-charmers/ovn-central
num_units: 3
@ -145,16 +129,13 @@ applications:
source: *openstack-origin
to:
- '12'
channel: candidate
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
channel: candidate
ovn-chassis:
charm: cs:~openstack-charmers/ovn-chassis
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: candidate
relations:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

19
tests/bundles/focal-wallaby-dvr-snat.yaml
View File

@ -28,22 +28,16 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
@ -53,7 +47,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -61,7 +54,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -76,7 +68,6 @@ applications:
enable-dvr: True
to:
- '4'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -84,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -92,7 +82,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -107,7 +96,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -120,7 +108,6 @@ applications:
to:
- '8'
- '9'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -128,16 +115,13 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '11'
channel: candidate
ovn-central:
charm: cs:~openstack-charmers/ovn-central
num_units: 3
@ -145,16 +129,13 @@ applications:
source: *openstack-origin
to:
- '12'
channel: candidate
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
channel: candidate
ovn-chassis:
charm: cs:~openstack-charmers/ovn-chassis
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: candidate
relations:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

19
tests/bundles/focal-xena-dvr-snat.yaml
View File

@ -28,22 +28,16 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
@ -53,7 +47,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -61,7 +54,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -76,7 +68,6 @@ applications:
enable-dvr: True
to:
- '4'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -84,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -92,7 +82,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -107,7 +96,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -120,7 +108,6 @@ applications:
to:
- '8'
- '9'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -128,16 +115,13 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '11'
channel: candidate
ovn-central:
charm: cs:~openstack-charmers/ovn-central
num_units: 3
@ -145,16 +129,13 @@ applications:
source: *openstack-origin
to:
- '12'
channel: candidate
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
channel: candidate
ovn-chassis:
charm: cs:~openstack-charmers/ovn-chassis
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: candidate
relations:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

19
tests/bundles/groovy-victoria-dvr-snat.yaml
View File

@ -28,22 +28,16 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
@ -53,7 +47,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -61,7 +54,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -76,7 +68,6 @@ applications:
enable-dvr: True
to:
- '4'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -84,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -92,7 +82,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -107,7 +96,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -120,7 +108,6 @@ applications:
to:
- '8'
- '9'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -128,16 +115,13 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '11'
channel: candidate
ovn-central:
charm: cs:~openstack-charmers/ovn-central
num_units: 3
@ -145,16 +129,13 @@ applications:
source: *openstack-origin
to:
- '12'
channel: candidate
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
channel: candidate
ovn-chassis:
charm: cs:~openstack-charmers/ovn-chassis
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: candidate
relations:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

19
tests/bundles/hirsute-wallaby-dvr-snat.yaml
View File

@ -28,22 +28,16 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
@ -53,7 +47,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -61,7 +54,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -76,7 +68,6 @@ applications:
enable-dvr: True
to:
- '4'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -84,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -92,7 +82,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -107,7 +96,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -120,7 +108,6 @@ applications:
to:
- '8'
- '9'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -128,16 +115,13 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '11'
channel: candidate
ovn-central:
charm: cs:~openstack-charmers/ovn-central
num_units: 3
@ -145,16 +129,13 @@ applications:
source: *openstack-origin
to:
- '12'
channel: candidate
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
channel: candidate
ovn-chassis:
charm: cs:~openstack-charmers/ovn-chassis
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: candidate
relations:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

19
tests/bundles/impish-xena-dvr-snat.yaml
View File

@ -28,22 +28,16 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
@ -53,7 +47,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -61,7 +54,6 @@ applications:
source: *openstack-origin
to:
- '3'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -76,7 +68,6 @@ applications:
enable-dvr: True
to:
- '4'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -84,7 +75,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -92,7 +82,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -107,7 +96,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -120,7 +108,6 @@ applications:
to:
- '8'
- '9'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
@ -128,16 +115,13 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: candidate
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '11'
channel: candidate
ovn-central:
charm: cs:~openstack-charmers/ovn-central
num_units: 3
@ -145,16 +129,13 @@ applications:
source: *openstack-origin
to:
- '12'
channel: candidate
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
channel: candidate
ovn-chassis:
charm: cs:~openstack-charmers/ovn-chassis
options:
# start new units paused to allow unit by unit OVS to OVN migration
new-units-paused: true
channel: candidate
relations:
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'

7
tests/bundles/trusty-mitaka.yaml
View File

@ -34,7 +34,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -45,7 +44,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -53,7 +51,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -61,7 +58,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
@ -72,7 +68,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
@ -81,7 +76,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -94,7 +88,6 @@ applications:
to:
- '7'
- '8'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

8
tests/bundles/xenial-mitaka.yaml
View File

@ -27,7 +27,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -35,7 +34,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -46,7 +44,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -54,7 +51,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -62,7 +58,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
@ -73,7 +68,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
@ -82,7 +76,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -95,7 +88,6 @@ applications:
to:
- '7'
- '8'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

8
tests/bundles/xenial-ocata.yaml
View File

@ -27,7 +27,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -35,7 +34,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -46,7 +44,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -54,7 +51,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -62,7 +58,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
@ -73,7 +68,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
@ -82,7 +76,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -95,7 +88,6 @@ applications:
to:
- '7'
- '8'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

8
tests/bundles/xenial-pike.yaml
View File

@ -27,7 +27,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -35,7 +34,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -46,7 +44,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -54,7 +51,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -62,7 +58,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
@ -73,7 +68,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
@ -82,7 +76,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -95,7 +88,6 @@ applications:
to:
- '7'
- '8'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'

7
tests/bundles/xenial-queens-dvr-snat.yaml
View File

@ -26,7 +26,6 @@ applications:
source: *openstack-origin
to:
- '0'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
@ -34,7 +33,6 @@ applications:
source: *openstack-origin
to:
- '1'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers/neutron-api
series: *series
@ -48,7 +46,6 @@ applications:
enable-dvr: True
to:
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
@ -56,7 +53,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
@ -64,7 +60,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: candidate
neutron-openvswitch:
charm: ../../../neutron-openvswitch
options:
@ -79,7 +74,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -92,7 +86,6 @@ applications:
to:
- '6'
- '7'
channel: candidate
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'