openstack
/
charm-keystone
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: Iba69950c9071555f1019fdd4214e6d02c7065e9c
This commit is contained in:
Liam Young 2020-02-17 15:45:12 +00:00
parent 755818526b
commit d3812d099b
13 changed files with 23 additions and 21 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.02

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.02
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:percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs: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:percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs: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:percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs: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:percona-cluster
num_units: 1
to:
- '0'
@ -33,7 +33,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:bionic-train

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

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

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: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: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:percona-cluster
num_units: 1
to:
- '0'
@ -30,7 +30,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs: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:percona-cluster
num_units: 1
to:
- '0'
@ -34,7 +34,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs: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:percona-cluster
num_units: 1
to:
- '0'
@ -34,7 +34,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs: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:percona-cluster
num_units: 1
to:
- '0'
@ -34,7 +34,7 @@ applications:
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens