openstack/charm-neutron-api
Code Issues Proposed changes

Updates for stable branch creation

Browse Source 
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
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/19.07

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/19.07
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/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