openstack
/
charm-neutron-gateway
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: I6d25022b6846264478e152ccd109c2a830d2a00a
This commit is contained in:
Liam Young 2020-02-17 15:54:07 +00:00
parent d5399356d3
commit 2a82fa1c31
12 changed files with 84 additions and 82 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-gateway.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,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin
@ -85,7 +85,7 @@ applications:
- '7'
- '8'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin
@ -85,7 +85,7 @@ applications:
- '7'
- '8'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -28,14 +28,14 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '1'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin

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

@ -21,21 +21,21 @@ 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'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
series: *series
num_units: 1
options:
@ -45,21 +45,21 @@ 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: "../../../neutron-gateway"
num_units: 1
@ -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:
openstack-origin: *openstack-origin