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: Ie552d2d3dfce5b83c0471eae5780013edc629ca1
This commit is contained in:
Aurelien Lourot 2020-11-02 11:48:34 +01:00
parent 4c77f69991
commit 8e6adf26a8
15 changed files with 50 additions and 48 deletions

View File

@ -2,3 +2,5 @@
host=review.opendev.org host=review.opendev.org
port=29418 port=29418
project=openstack/charm-neutron-api.git project=openstack/charm-neutron-api.git
defaultbranch=stable/20.10

View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers repo: https://github.com/juju/charm-helpers@stable/20.10
destination: hooks/charmhelpers destination: hooks/charmhelpers
include: include:
- core - core

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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