openstack
/
charm-neutron-api
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch amulet tests to stable.

Switch zaza bundles to stable charms.

Switch to using stable charm-helpers branch.

Change-Id: I8c341da317d2825a5a0d85873fd43559130123d1
This commit is contained in:
Liam Young 2020-02-17 15:46:33 +00:00
parent c2d5dc5719
commit cb2def0e35
19 changed files with 142 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-neutron-api.git
defaultbranch=stable/20.02

2
charm-helpers-hooks.yaml
View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/20.02
destination: hooks/charmhelpers
include:
- core

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -20,14 +20,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -47,27 +47,27 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
options:
use-dvr-snat: True
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

16
tests/bundles/bionic-stein-dvr.yaml
View File

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -48,26 +48,26 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
options:
enable-local-dhcp-and-metadata: True
bridge-mappings: physnet1:br-ex
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -83,7 +83,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -48,27 +48,27 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
options:
use-dvr-snat: True
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -76,7 +76,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@ -88,7 +88,7 @@ applications:
- '6'
- '7'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
options:
openstack-origin: *openstack-origin

18
tests/bundles/bionic-train-dvr.yaml
View File

@ -22,14 +22,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -49,26 +49,26 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
options:
enable-local-dhcp-and-metadata: True
bridge-mappings: physnet1:br-ex
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -76,7 +76,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -84,7 +84,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@ -96,7 +96,7 @@ applications:
- '7'
- '8'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
options:
openstack-origin: *openstack-origin

24
tests/bundles/bionic-train-ovn.yaml
View File

@ -25,26 +25,26 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '1'
vault:
charm: cs:~openstack-charmers-next/vault
charm: cs:vault
num_units: 1
to:
- '2'
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
charm: cs:ovn-central
num_units: 3
options:
source: *openstack-origin
@ -53,9 +53,9 @@ applications:
- '4'
- '5'
neutron-api-plugin-ovn:
charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
charm: cs:neutron-api-plugin-ovn
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -66,21 +66,21 @@ applications:
to:
- '6'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '8'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -88,9 +88,9 @@ applications:
to:
- '9'
ovn-chassis:
charm: cs:~openstack-charmers-next/ovn-chassis
charm: cs:ovn-chassis
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@ -102,7 +102,7 @@ applications:
- '10'
- '11'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@ -89,7 +89,7 @@ applications:
- '7'
- '8'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
options:
openstack-origin: *openstack-origin

16
tests/bundles/disco-stein.yaml
View File

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -28,7 +28,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -20,14 +20,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -47,27 +47,27 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
options:
use-dvr-snat: True
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

16
tests/bundles/xenial-queens-dvr.yaml
View File

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -48,26 +48,26 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
options:
enable-local-dhcp-and-metadata: True
bridge-mappings: physnet1:br-ex
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -83,7 +83,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

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

@ -21,14 +21,14 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
source: *openstack-origin
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -45,23 +45,23 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@ -69,7 +69,7 @@ applications:
to:
- '5'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -77,7 +77,7 @@ applications:
to:
- '6'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4