openstack
/
charm-neutron-api
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch tests to stable.

Switch to using stable charm-helpers branch.

Switch to using stable charm.openstack branch.

Change-Id: I5d2b28e5e050ee8f2ab986f577e212711f7b9060
This commit is contained in:
David Ames 2020-05-21 09:57:35 -07:00
parent e495768b4a
commit d468c02aa5
13 changed files with 38 additions and 36 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.05

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.05
destination: hooks/charmhelpers
include:
- core

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

@ -6,12 +6,12 @@ series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -25,7 +25,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -5,21 +5,21 @@ series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
series: *series
num_units: 1
options:
@ -28,7 +28,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -11,7 +11,7 @@ applications:
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series xenial
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series xenial
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series xenial
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series xenial
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin