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 to using stable charm-helpers branch.

Change-Id: I6d3364b2d6fc0d4cf82ca026da32dbeeecb7aa26
This commit is contained in:
David Ames 2019-10-24 12:28:39 -07:00
parent 9b68baa799
commit 2baf173cbe
14 changed files with 93 additions and 13 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/19.10

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/19.10
destination: charmhelpers
include:
- core

2
tests/basic_deployment.py
View File

@ -21,7 +21,7 @@ class BasicDeployment(OpenStackAmuletDeployment):
utils = AmuletUtils()
def __init__(self, vip=None, units=1, series="trusty", openstack=None,
source=None, stable=False):
source=None, stable=True):
super(BasicDeployment, self).__init__(series, openstack, source,
stable)
self.units = units

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
View File

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

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

@ -0,0 +1,14 @@
relations:
- - percona-cluster
- hacluster
applications:
percona-cluster:
num_units: 3
options:
min-cluster-size: 3
hacluster:
charm: cs:hacluster
num_units: 0
options:
cluster_count: 3

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

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

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

@ -0,0 +1,14 @@
relations:
- - percona-cluster
- hacluster
applications:
percona-cluster:
num_units: 3
options:
min-cluster-size: 3
hacluster:
charm: cs:hacluster
num_units: 0
options:
cluster_count: 3

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

@ -8,7 +8,7 @@ applications:
options:
min-cluster-size: 3
hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:hacluster
num_units: 0
options:
cluster_count: 3

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

@ -15,7 +15,7 @@ applications:
vip: {{ OS_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
View File

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

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

@ -0,0 +1,14 @@
relations:
- - percona-cluster
- hacluster
applications:
percona-cluster:
num_units: 3
options:
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