openstack
/
charm-neutron-dynamic-routing
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: If46e921145e692ff964bf5291adb47c90df66e70
This commit is contained in:
Liam Young 2020-02-17 15:53:58 +00:00
parent 844226fe1f
commit b2567acc79
10 changed files with 44 additions and 40 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-dynamic-routing.git
defaultbranch=stable/20.02

10
src/tests/bundles/bionic-queens-functional.yaml
View File

@ -8,7 +8,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/bionic/keystone
charm: cs:bionic/keystone
constraints: mem=1G
num_units: 1
options:
@ -18,12 +18,12 @@ applications:
haproxy-connect-timeout: 9000
series: bionic
mysql:
charm: cs:~openstack-charmers-next/bionic/percona-cluster
charm: cs:bionic/percona-cluster
constraints: mem=4G
num_units: 1
series: bionic
neutron-api:
charm: cs:~openstack-charmers-next/bionic/neutron-api
charm: cs:bionic/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -39,12 +39,12 @@ applications:
num_units: 1
series: bionic
rabbitmq-server:
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
charm: cs:bionic/rabbitmq-server
constraints: mem=1G
num_units: 1
series: bionic
quagga:
charm: cs:~openstack-charmers-next/bionic/quagga
charm: cs:bionic/quagga
num_units: 1
series: bionic

10
src/tests/bundles/bionic-rocky-functional.yaml
View File

@ -7,7 +7,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/bionic/keystone
charm: cs:bionic/keystone
constraints: mem=1G
num_units: 1
options:
@ -18,13 +18,13 @@ applications:
haproxy-connect-timeout: 9000
series: bionic
mysql:
charm: cs:~openstack-charmers-next/bionic/percona-cluster
charm: cs:bionic/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:bionic-rocky'}
series: bionic
neutron-api:
charm: cs:~openstack-charmers-next/bionic/neutron-api
charm: cs:bionic/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -42,12 +42,12 @@ applications:
options: {openstack-origin: 'cloud:bionic-rocky'}
series: bionic
rabbitmq-server:
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
charm: cs:bionic/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:bionic-rocky'}
series: bionic
quagga:
charm: cs:~openstack-charmers-next/bionic/quagga
charm: cs:bionic/quagga
num_units: 1
series: bionic

10
src/tests/bundles/bionic-stein-functional.yaml
View File

@ -7,7 +7,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/bionic/keystone
charm: cs:bionic/keystone
constraints: mem=1G
num_units: 1
options:
@ -18,13 +18,13 @@ applications:
haproxy-connect-timeout: 9000
series: bionic
mysql:
charm: cs:~openstack-charmers-next/bionic/percona-cluster
charm: cs:bionic/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:bionic-stein'}
series: bionic
neutron-api:
charm: cs:~openstack-charmers-next/bionic/neutron-api
charm: cs:bionic/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -42,12 +42,12 @@ applications:
options: {openstack-origin: 'cloud:bionic-stein'}
series: bionic
rabbitmq-server:
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
charm: cs:bionic/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:bionic-stein'}
series: bionic
quagga:
charm: cs:~openstack-charmers-next/bionic/quagga
charm: cs:bionic/quagga
num_units: 1
series: bionic

10
src/tests/bundles/bionic-train-functional.yaml
View File

@ -7,7 +7,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/bionic/keystone
charm: cs:bionic/keystone
constraints: mem=1G
num_units: 1
options:
@ -18,13 +18,13 @@ applications:
haproxy-connect-timeout: 9000
series: bionic
mysql:
charm: cs:~openstack-charmers-next/bionic/percona-cluster
charm: cs:bionic/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:bionic-train'}
series: bionic
neutron-api:
charm: cs:~openstack-charmers-next/bionic/neutron-api
charm: cs:bionic/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -42,12 +42,12 @@ applications:
options: {openstack-origin: 'cloud:bionic-train'}
series: bionic
rabbitmq-server:
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
charm: cs:bionic/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:bionic-train'}
series: bionic
quagga:
charm: cs:~openstack-charmers-next/bionic/quagga
charm: cs:bionic/quagga
num_units: 1
series: bionic

10
src/tests/bundles/disco-stein-functional.yaml
View File

@ -8,7 +8,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/bionic/keystone
charm: cs:bionic/keystone
constraints: mem=1G
num_units: 1
options:
@ -18,12 +18,12 @@ applications:
haproxy-connect-timeout: 9000
series: disco
mysql:
charm: cs:~openstack-charmers-next/bionic/percona-cluster
charm: cs:bionic/percona-cluster
constraints: mem=4G
num_units: 1
series: disco
neutron-api:
charm: cs:~openstack-charmers-next/bionic/neutron-api
charm: cs:bionic/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -39,12 +39,12 @@ applications:
num_units: 1
series: disco
rabbitmq-server:
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
charm: cs:bionic/rabbitmq-server
constraints: mem=1G
num_units: 1
series: disco
quagga:
charm: cs:~openstack-charmers-next/bionic/quagga
charm: cs:bionic/quagga
num_units: 1
series: disco

10
src/tests/bundles/xenial-ocata-functional.yaml
View File

@ -8,7 +8,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/xenial/keystone
charm: cs:xenial/keystone
constraints: mem=1G
num_units: 1
options:
@ -19,13 +19,13 @@ applications:
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
charm: cs:xenial/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:xenial-ocata'}
series: xenial
neutron-api:
charm: cs:~openstack-charmers-next/xenial/neutron-api
charm: cs:xenial/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -43,13 +43,13 @@ applications:
options: {openstack-origin: 'cloud:xenial-ocata'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
charm: cs:xenial/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:xenial-ocata'}
series: xenial
quagga:
charm: cs:~openstack-charmers-next/xenial/quagga
charm: cs:xenial/quagga
num_units: 1
options: {use-16bit-asn: True}
series: xenial

10
src/tests/bundles/xenial-pike-functional.yaml
View File

@ -8,7 +8,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/xenial/keystone
charm: cs:xenial/keystone
constraints: mem=1G
num_units: 1
options:
@ -19,13 +19,13 @@ applications:
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
charm: cs:xenial/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:xenial-pike'}
series: xenial
neutron-api:
charm: cs:~openstack-charmers-next/xenial/neutron-api
charm: cs:xenial/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -43,13 +43,13 @@ applications:
options: {openstack-origin: 'cloud:xenial-pike'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
charm: cs:xenial/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:xenial-pike'}
series: xenial
quagga:
charm: cs:~openstack-charmers-next/xenial/quagga
charm: cs:xenial/quagga
num_units: 1
options: {use-16bit-asn: True}
series: xenial

10
src/tests/bundles/xenial-queens-functional.yaml
View File

@ -7,7 +7,7 @@ relations:
- [neutron-api, keystone]
applications:
keystone:
charm: cs:~openstack-charmers-next/xenial/keystone
charm: cs:xenial/keystone
constraints: mem=1G
num_units: 1
options:
@ -18,13 +18,13 @@ applications:
haproxy-connect-timeout: 9000
series: xenial
mysql:
charm: cs:~openstack-charmers-next/xenial/percona-cluster
charm: cs:xenial/percona-cluster
constraints: mem=4G
num_units: 1
options: {source: 'cloud:xenial-queens'}
series: xenial
neutron-api:
charm: cs:~openstack-charmers-next/xenial/neutron-api
charm: cs:xenial/neutron-api
constraints: mem=1G
num_units: 1
options:
@ -42,12 +42,12 @@ applications:
options: {openstack-origin: 'cloud:xenial-queens'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
charm: cs:xenial/rabbitmq-server
constraints: mem=1G
num_units: 1
options: {source: 'cloud:xenial-queens'}
series: xenial
quagga:
charm: cs:~openstack-charmers-next/xenial/quagga
charm: cs:xenial/quagga
num_units: 1
series: xenial

2
src/wheelhouse.txt
View File

@ -1,3 +1,5 @@
jinja2
psutil
git+https://opendev.org/openstack/charms.openstack.git@stable/20.02#egg=charms.openstack