Updates for stable branch creation

Set default branch for git review/gerrit.

Switch amulet tests to stable.

Switch to using stable charm-helpers branch.

Change-Id: Id90e6e527aaf9749663f8a3b2747932c0b59a5b3
This commit is contained in:
David Ames 2019-08-12 09:41:40 -07:00
parent d12413ffad
commit ca19112f02
15 changed files with 104 additions and 102 deletions

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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