openstack
/
charm-percona-cluster
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: I7e9bf6d705a8dac8932699e527509bfde7ee7058
This commit is contained in:
Liam Young 2020-02-17 15:56:00 +00:00
parent 1cf3fa1ac1
commit 6ef57fee8f
12 changed files with 94 additions and 11 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-percona-cluster.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

1
tests/bundles/bionic-ha.yaml
View File

@ -1 +0,0 @@
bionic.yaml

14
tests/bundles/bionic-ha.yaml Normal file
View File

@ -0,0 +1,14 @@
series: bionic
relations:
- - keystone:shared-db
- percona-cluster:shared-db
applications:
percona-cluster:
series: bionic
charm: ../../../percona-cluster
num_units: 1
keystone:
charm: cs:keystone
num_units: 1
options:
token-expiration: 60

2
tests/bundles/bionic.yaml
View File

@ -8,7 +8,7 @@ applications:
charm: ../../../percona-cluster
num_units: 1
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
token-expiration: 60

1
tests/bundles/disco-ha.yaml
View File

@ -1 +0,0 @@
disco.yaml

14
tests/bundles/disco-ha.yaml Normal file
View File

@ -0,0 +1,14 @@
series: disco
relations:
- - keystone:shared-db
- percona-cluster:shared-db
applications:
percona-cluster:
series: disco
charm: ../../../percona-cluster
num_units: 1
keystone:
charm: cs:keystone
num_units: 1
options:
token-expiration: 60

2
tests/bundles/disco.yaml
View File

@ -8,7 +8,7 @@ applications:
charm: ../../../percona-cluster
num_units: 1
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
token-expiration: 60

1
tests/bundles/overlays/bionic-ha.yaml.j2
View File

@ -1 +0,0 @@
ha.yaml

15
tests/bundles/overlays/bionic-ha.yaml.j2 Normal file
View File

@ -0,0 +1,15 @@
relations:
- - percona-cluster
- hacluster
applications:
percona-cluster:
num_units: 3
options:
vip: {{ TEST_VIP00 }}
min-cluster-size: 3
hacluster:
charm: cs:hacluster
num_units: 0
options:
cluster_count: 3

1
tests/bundles/overlays/disco-ha.yaml.j2
View File

@ -1 +0,0 @@
ha.yaml

15
tests/bundles/overlays/disco-ha.yaml.j2 Normal file
View File

@ -0,0 +1,15 @@
relations:
- - percona-cluster
- hacluster
applications:
percona-cluster:
num_units: 3
options:
vip: {{ TEST_VIP00 }}
min-cluster-size: 3
hacluster:
charm: cs:hacluster
num_units: 0
options:
cluster_count: 3

2
tests/bundles/overlays/ha.yaml
View File

@ -9,7 +9,7 @@ applications:
vip: {{ TEST_VIP00 }}
min-cluster-size: 3
hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:hacluster
num_units: 0
options:
cluster_count: 3

1
tests/bundles/overlays/xenial-ha.yaml.j2
View File

@ -1 +0,0 @@
ha.yaml

15
tests/bundles/overlays/xenial-ha.yaml.j2 Normal file
View File

@ -0,0 +1,15 @@
relations:
- - percona-cluster
- hacluster
applications:
percona-cluster:
num_units: 3
options:
vip: {{ TEST_VIP00 }}
min-cluster-size: 3
hacluster:
charm: cs:hacluster
num_units: 0
options:
cluster_count: 3

1
tests/bundles/xenial-ha.yaml
View File

@ -1 +0,0 @@
xenial.yaml

14
tests/bundles/xenial-ha.yaml Normal file
View File

@ -0,0 +1,14 @@
series: xenial
relations:
- - keystone:shared-db
- percona-cluster:shared-db
applications:
percona-cluster:
series: xenial
charm: ../../../percona-cluster
num_units: 1
keystone:
charm: cs:keystone
num_units: 1
options:
token-expiration: 60

2
tests/bundles/xenial.yaml
View File

@ -8,7 +8,7 @@ applications:
charm: ../../../percona-cluster
num_units: 1
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
token-expiration: 60