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:
parent
844226fe1f
commit
b2567acc79
|
@ -2,3 +2,5 @@
|
||||||
host=review.opendev.org
|
host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-neutron-dynamic-routing.git
|
project=openstack/charm-neutron-dynamic-routing.git
|
||||||
|
|
||||||
|
defaultbranch=stable/20.02
|
||||||
|
|
|
@ -8,7 +8,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
charm: cs:bionic/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -18,12 +18,12 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: bionic
|
series: bionic
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/bionic/percona-cluster
|
charm: cs:bionic/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: bionic
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
charm: cs:bionic/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -39,12 +39,12 @@ applications:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: bionic
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
|
charm: cs:bionic/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: bionic
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
charm: cs:bionic/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: bionic
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
charm: cs:bionic/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -18,13 +18,13 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: bionic
|
series: bionic
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/bionic/percona-cluster
|
charm: cs:bionic/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:bionic-rocky'}
|
options: {source: 'cloud:bionic-rocky'}
|
||||||
series: bionic
|
series: bionic
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
charm: cs:bionic/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -42,12 +42,12 @@ applications:
|
||||||
options: {openstack-origin: 'cloud:bionic-rocky'}
|
options: {openstack-origin: 'cloud:bionic-rocky'}
|
||||||
series: bionic
|
series: bionic
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
|
charm: cs:bionic/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:bionic-rocky'}
|
options: {source: 'cloud:bionic-rocky'}
|
||||||
series: bionic
|
series: bionic
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
charm: cs:bionic/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: bionic
|
||||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
charm: cs:bionic/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -18,13 +18,13 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: bionic
|
series: bionic
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/bionic/percona-cluster
|
charm: cs:bionic/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:bionic-stein'}
|
options: {source: 'cloud:bionic-stein'}
|
||||||
series: bionic
|
series: bionic
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
charm: cs:bionic/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -42,12 +42,12 @@ applications:
|
||||||
options: {openstack-origin: 'cloud:bionic-stein'}
|
options: {openstack-origin: 'cloud:bionic-stein'}
|
||||||
series: bionic
|
series: bionic
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
|
charm: cs:bionic/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:bionic-stein'}
|
options: {source: 'cloud:bionic-stein'}
|
||||||
series: bionic
|
series: bionic
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
charm: cs:bionic/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: bionic
|
||||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
charm: cs:bionic/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -18,13 +18,13 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: bionic
|
series: bionic
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/bionic/percona-cluster
|
charm: cs:bionic/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:bionic-train'}
|
options: {source: 'cloud:bionic-train'}
|
||||||
series: bionic
|
series: bionic
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
charm: cs:bionic/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -42,12 +42,12 @@ applications:
|
||||||
options: {openstack-origin: 'cloud:bionic-train'}
|
options: {openstack-origin: 'cloud:bionic-train'}
|
||||||
series: bionic
|
series: bionic
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
|
charm: cs:bionic/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:bionic-train'}
|
options: {source: 'cloud:bionic-train'}
|
||||||
series: bionic
|
series: bionic
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
charm: cs:bionic/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: bionic
|
||||||
|
|
|
@ -8,7 +8,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
charm: cs:bionic/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -18,12 +18,12 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: disco
|
series: disco
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/bionic/percona-cluster
|
charm: cs:bionic/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: disco
|
series: disco
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
charm: cs:bionic/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -39,12 +39,12 @@ applications:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: disco
|
series: disco
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
|
charm: cs:bionic/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: disco
|
series: disco
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
charm: cs:bionic/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: disco
|
series: disco
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
charm: cs:xenial/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -19,13 +19,13 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: xenial
|
series: xenial
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/xenial/percona-cluster
|
charm: cs:xenial/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:xenial-ocata'}
|
options: {source: 'cloud:xenial-ocata'}
|
||||||
series: xenial
|
series: xenial
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/xenial/neutron-api
|
charm: cs:xenial/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -43,13 +43,13 @@ applications:
|
||||||
options: {openstack-origin: 'cloud:xenial-ocata'}
|
options: {openstack-origin: 'cloud:xenial-ocata'}
|
||||||
series: xenial
|
series: xenial
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
|
charm: cs:xenial/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:xenial-ocata'}
|
options: {source: 'cloud:xenial-ocata'}
|
||||||
series: xenial
|
series: xenial
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/xenial/quagga
|
charm: cs:xenial/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {use-16bit-asn: True}
|
options: {use-16bit-asn: True}
|
||||||
series: xenial
|
series: xenial
|
||||||
|
|
|
@ -8,7 +8,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
charm: cs:xenial/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -19,13 +19,13 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: xenial
|
series: xenial
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/xenial/percona-cluster
|
charm: cs:xenial/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:xenial-pike'}
|
options: {source: 'cloud:xenial-pike'}
|
||||||
series: xenial
|
series: xenial
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/xenial/neutron-api
|
charm: cs:xenial/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -43,13 +43,13 @@ applications:
|
||||||
options: {openstack-origin: 'cloud:xenial-pike'}
|
options: {openstack-origin: 'cloud:xenial-pike'}
|
||||||
series: xenial
|
series: xenial
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
|
charm: cs:xenial/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:xenial-pike'}
|
options: {source: 'cloud:xenial-pike'}
|
||||||
series: xenial
|
series: xenial
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/xenial/quagga
|
charm: cs:xenial/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {use-16bit-asn: True}
|
options: {use-16bit-asn: True}
|
||||||
series: xenial
|
series: xenial
|
||||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
||||||
- [neutron-api, keystone]
|
- [neutron-api, keystone]
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
charm: cs:xenial/keystone
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -18,13 +18,13 @@ applications:
|
||||||
haproxy-connect-timeout: 9000
|
haproxy-connect-timeout: 9000
|
||||||
series: xenial
|
series: xenial
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/xenial/percona-cluster
|
charm: cs:xenial/percona-cluster
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:xenial-queens'}
|
options: {source: 'cloud:xenial-queens'}
|
||||||
series: xenial
|
series: xenial
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/xenial/neutron-api
|
charm: cs:xenial/neutron-api
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -42,12 +42,12 @@ applications:
|
||||||
options: {openstack-origin: 'cloud:xenial-queens'}
|
options: {openstack-origin: 'cloud:xenial-queens'}
|
||||||
series: xenial
|
series: xenial
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
|
charm: cs:xenial/rabbitmq-server
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options: {source: 'cloud:xenial-queens'}
|
options: {source: 'cloud:xenial-queens'}
|
||||||
series: xenial
|
series: xenial
|
||||||
quagga:
|
quagga:
|
||||||
charm: cs:~openstack-charmers-next/xenial/quagga
|
charm: cs:xenial/quagga
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: xenial
|
series: xenial
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
|
||||||
jinja2
|
jinja2
|
||||||
psutil
|
psutil
|
||||||
|
|
||||||
|
git+https://opendev.org/openstack/charms.openstack.git@stable/20.02#egg=charms.openstack
|
||||||
|
|
Loading…
Reference in New Issue