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: I8583f89a2207b296bd09d4d4bc3a427452106a23
This commit is contained in:
parent
95efe691cf
commit
42d2dac64e
|
@ -2,3 +2,5 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-neutron-dynamic-routing.git
|
||||
|
||||
defaultbranch=stable/20.08
|
||||
|
|
|
@ -8,7 +8,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/bionic/percona-cluster
|
||||
constraints: mem=4G
|
||||
num_units: 1
|
||||
series: bionic
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/bionic/rabbitmq-server
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
series: bionic
|
||||
quagga:
|
||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
||||
charm: cs:~openstack-charmers/bionic/quagga
|
||||
num_units: 1
|
||||
series: bionic
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/bionic/quagga
|
||||
num_units: 1
|
||||
series: bionic
|
||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/bionic/quagga
|
||||
num_units: 1
|
||||
series: bionic
|
||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/bionic/quagga
|
||||
num_units: 1
|
||||
series: bionic
|
||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/bionic/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/bionic/percona-cluster
|
||||
constraints: mem=4G
|
||||
num_units: 1
|
||||
options: {source: 'cloud:bionic-ussuri'}
|
||||
series: bionic
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/bionic/neutron-api
|
||||
charm: cs:~openstack-charmers/bionic/neutron-api
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -44,12 +44,12 @@ applications:
|
|||
options: {openstack-origin: 'cloud:bionic-ussuri'}
|
||||
series: bionic
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/bionic/rabbitmq-server
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
options: {source: 'cloud:bionic-ussuri'}
|
||||
series: bionic
|
||||
quagga:
|
||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
||||
charm: cs:~openstack-charmers/bionic/quagga
|
||||
num_units: 1
|
||||
series: bionic
|
||||
|
|
|
@ -23,12 +23,12 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
neutron-api-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
|
||||
|
@ -38,7 +38,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -50,7 +50,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -74,7 +74,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -82,7 +82,7 @@ applications:
|
|||
- '6'
|
||||
|
||||
quagga:
|
||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
||||
charm: cs:~openstack-charmers/bionic/quagga
|
||||
series: bionic
|
||||
num_units: 1
|
||||
to:
|
||||
|
|
|
@ -23,12 +23,12 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
neutron-api-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
|
||||
|
@ -38,7 +38,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -50,7 +50,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -74,7 +74,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -82,7 +82,7 @@ applications:
|
|||
- '6'
|
||||
|
||||
quagga:
|
||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
||||
charm: cs:~openstack-charmers/bionic/quagga
|
||||
series: bionic
|
||||
num_units: 1
|
||||
to:
|
||||
|
|
|
@ -23,12 +23,12 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
neutron-api-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
|
||||
|
@ -38,7 +38,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -50,7 +50,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -74,7 +74,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -82,7 +82,7 @@ applications:
|
|||
- '6'
|
||||
|
||||
quagga:
|
||||
charm: cs:~openstack-charmers-next/bionic/quagga
|
||||
charm: cs:~openstack-charmers/bionic/quagga
|
||||
series: bionic
|
||||
num_units: 1
|
||||
to:
|
||||
|
|
|
@ -8,7 +8,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/xenial/quagga
|
||||
num_units: 1
|
||||
options: {use-16bit-asn: True}
|
||||
series: xenial
|
||||
|
|
|
@ -8,7 +8,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/xenial/quagga
|
||||
num_units: 1
|
||||
options: {use-16bit-asn: True}
|
||||
series: xenial
|
||||
|
|
|
@ -7,7 +7,7 @@ relations:
|
|||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
||||
charm: cs:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/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:~openstack-charmers/xenial/quagga
|
||||
num_units: 1
|
||||
series: xenial
|
||||
|
|
|
@ -1 +1,5 @@
|
|||
psutil
|
||||
|
||||
git+https://opendev.org/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git@stable/20.08#egg=charmhelpers
|
||||
|
|
|
@ -11,7 +11,7 @@ charms.reactive
|
|||
mock>=1.2
|
||||
nose>=1.3.7
|
||||
coverage>=3.6
|
||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
netifaces # vault
|
||||
|
|
Loading…
Reference in New Issue