openstack/charm-nova-cloud-controller
Code Issues Proposed changes

21.10 - Release

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

Change-Id: I7b13857378d60b9dfcaa4c44156550994f744af0
This commit is contained in:
Alex Kavanagh 2021-10-21 14:49:41 +01:00
parent 5bd75f5e81
commit e4af560e1c
16 changed files with 0 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/bundles/bionic-queens.yaml
View File

@ -42,7 +42,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -52,7 +51,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -68,24 +66,19 @@ applications:
options:
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -97,4 +90,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

8
tests/bundles/bionic-rocky.yaml
View File

@ -42,7 +42,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -52,7 +51,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -70,29 +68,24 @@ applications:
openstack-origin: cloud:bionic-rocky
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -105,4 +98,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

8
tests/bundles/bionic-stein.yaml
View File

@ -42,7 +42,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -52,7 +51,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -70,29 +68,24 @@ applications:
openstack-origin: cloud:bionic-stein
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-stein
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -105,4 +98,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

9
tests/bundles/bionic-train.yaml
View File

@ -48,7 +48,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -58,7 +57,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -76,35 +74,29 @@ applications:
openstack-origin: cloud:bionic-train
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-train
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -117,4 +109,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

9
tests/bundles/bionic-ussuri.yaml
View File

@ -48,7 +48,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -58,7 +57,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -78,35 +76,29 @@ applications:
openstack-origin: cloud:bionic-ussuri
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -119,4 +111,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

16
tests/bundles/focal-ussuri.yaml
View File

@ -31,22 +31,16 @@ applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-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
@ -59,14 +53,12 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
@ -92,7 +84,6 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -101,7 +92,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
@ -111,7 +101,6 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
@ -120,11 +109,9 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@ -133,7 +120,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@ -149,14 +135,12 @@ applications:
to:
- '10'
- '11'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '12'
channel: candidate
relations:

16
tests/bundles/focal-victoria.yaml
View File

@ -31,22 +31,16 @@ applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-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
@ -59,14 +53,12 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
@ -92,7 +84,6 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -101,7 +92,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
@ -111,7 +101,6 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
@ -120,11 +109,9 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@ -133,7 +120,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@ -149,14 +135,12 @@ applications:
to:
- '10'
- '11'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '12'
channel: candidate
relations:

16
tests/bundles/focal-wallaby.yaml
View File

@ -31,22 +31,16 @@ applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-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
@ -59,14 +53,12 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
@ -92,7 +84,6 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -101,7 +92,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
@ -111,7 +101,6 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
@ -120,11 +109,9 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@ -133,7 +120,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@ -149,14 +135,12 @@ applications:
to:
- '10'
- '11'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '12'
channel: candidate
relations:

16
tests/bundles/focal-xena.yaml
View File

@ -31,22 +31,16 @@ applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-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
@ -59,14 +53,12 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
@ -92,7 +84,6 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -101,7 +92,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
@ -111,7 +101,6 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
@ -120,11 +109,9 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@ -133,7 +120,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@ -149,14 +135,12 @@ applications:
to:
- '10'
- '11'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '12'
channel: candidate
relations:

16
tests/bundles/groovy-victoria.yaml
View File

@ -31,22 +31,16 @@ applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-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
@ -59,14 +53,12 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
@ -92,7 +84,6 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -101,7 +92,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
@ -111,7 +101,6 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
@ -120,11 +109,9 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@ -133,7 +120,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@ -149,14 +135,12 @@ applications:
to:
- '10'
- '11'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '12'
channel: candidate
relations:

16
tests/bundles/hirsute-wallaby.yaml
View File

@ -31,22 +31,16 @@ applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-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
@ -59,14 +53,12 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
@ -92,7 +84,6 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -101,7 +92,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
@ -111,7 +101,6 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
@ -120,11 +109,9 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@ -133,7 +120,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@ -149,14 +135,12 @@ applications:
to:
- '10'
- '11'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '12'
channel: candidate
relations:

16
tests/bundles/impish-xena.yaml
View File

@ -31,22 +31,16 @@ applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-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
@ -59,14 +53,12 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
@ -92,7 +84,6 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@ -101,7 +92,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
@ -111,7 +101,6 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
@ -120,11 +109,9 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@ -133,7 +120,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@ -149,14 +135,12 @@ applications:
to:
- '10'
- '11'
channel: candidate
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '12'
channel: candidate
relations:

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

@ -42,7 +42,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -52,7 +51,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -66,24 +64,19 @@ applications:
options:
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -95,4 +88,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

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

@ -42,7 +42,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -52,7 +51,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -70,29 +68,24 @@ applications:
openstack-origin: cloud:xenial-ocata
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -105,4 +98,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

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

@ -42,7 +42,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -52,7 +51,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -70,29 +68,24 @@ applications:
openstack-origin: cloud:xenial-pike
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:xenial-pike
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -105,4 +98,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate

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

@ -42,7 +42,6 @@ applications:
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -52,7 +51,6 @@ applications:
dataset-size: 25%
root-password: ChangeMe123
sst-password: ChangeMe123
channel: candidate
nova-cloud-controller:
charm: ../../../nova-cloud-controller
num_units: 1
@ -70,29 +68,24 @@ applications:
openstack-origin: cloud:xenial-queens
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:xenial-queens
bridge-mappings: physnet1:br-ex
channel: candidate
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
@ -105,4 +98,3 @@ applications:
ephemeral-device: /dev/vdb
ephemeral-unmount: /mnt
debug: true
channel: candidate