openstack
/
charm-keystone
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: Ib395170c4439c6515fbd972214d4ac4bf4ded4f3
This commit is contained in:
Alex Kavanagh 2020-08-13 11:32:32 +01:00
parent 9e2d5cf2b7
commit 1d873c9337
16 changed files with 35 additions and 33 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-keystone.git
defaultbranch=stable/20.08

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.08
destination: charmhelpers
include:
- core

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '4'

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-train

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -32,7 +32,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri

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

@ -20,12 +20,12 @@ machines:
applications:
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
keystone-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
@ -47,7 +47,7 @@ applications:
- '5'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin

8
tests/bundles/focal-victoria.yaml
View File

@ -20,12 +20,12 @@ machines:
applications:
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
keystone-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
@ -47,7 +47,7 @@ applications:
- '5'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin

8
tests/bundles/groovy-victoria.yaml
View File

@ -20,12 +20,12 @@ machines:
applications:
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
keystone-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
@ -47,7 +47,7 @@ applications:
- '5'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin

2
tests/bundles/overlays/local-charm-overlay.yaml.j2
View File

@ -4,7 +4,7 @@ applications:
options:
vip: '{{ OS_VIP00 }}'
hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
relations:
- - keystone

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

@ -37,7 +37,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -30,7 +30,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '4'

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -34,7 +34,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -34,7 +34,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike

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

@ -17,7 +17,7 @@ relations:
- keystone:identity-service
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
@ -34,7 +34,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens