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:
parent
9b68baa799
commit
2baf173cbe
|
@ -2,3 +2,5 @@
|
||||||
host=review.opendev.org
|
host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-percona-cluster.git
|
project=openstack/charm-percona-cluster.git
|
||||||
|
|
||||||
|
defaultbranch=stable/19.10
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
repo: https://github.com/juju/charm-helpers
|
repo: https://github.com/juju/charm-helpers@stable/19.10
|
||||||
destination: charmhelpers
|
destination: charmhelpers
|
||||||
include:
|
include:
|
||||||
- core
|
- core
|
||||||
|
|
|
@ -21,7 +21,7 @@ class BasicDeployment(OpenStackAmuletDeployment):
|
||||||
utils = AmuletUtils()
|
utils = AmuletUtils()
|
||||||
|
|
||||||
def __init__(self, vip=None, units=1, series="trusty", openstack=None,
|
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,
|
super(BasicDeployment, self).__init__(series, openstack, source,
|
||||||
stable)
|
stable)
|
||||||
self.units = units
|
self.units = units
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
bionic.yaml
|
|
|
@ -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
|
|
@ -8,7 +8,7 @@ applications:
|
||||||
charm: ../../../percona-cluster
|
charm: ../../../percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
token-expiration: 60
|
token-expiration: 60
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
disco.yaml
|
|
|
@ -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
|
|
@ -8,7 +8,7 @@ applications:
|
||||||
charm: ../../../percona-cluster
|
charm: ../../../percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
token-expiration: 60
|
token-expiration: 60
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
ha.yaml
|
|
|
@ -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 +0,0 @@
|
||||||
ha.yaml
|
|
|
@ -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
|
|
@ -8,7 +8,7 @@ applications:
|
||||||
options:
|
options:
|
||||||
min-cluster-size: 3
|
min-cluster-size: 3
|
||||||
hacluster:
|
hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
|
|
|
@ -15,7 +15,7 @@ applications:
|
||||||
vip: {{ OS_VIP00 }}
|
vip: {{ OS_VIP00 }}
|
||||||
min-cluster-size: 3
|
min-cluster-size: 3
|
||||||
hacluster:
|
hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
ha.yaml
|
|
|
@ -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 +0,0 @@
|
||||||
xenial.yaml
|
|
|
@ -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
|
|
@ -8,7 +8,7 @@ applications:
|
||||||
charm: ../../../percona-cluster
|
charm: ../../../percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
token-expiration: 60
|
token-expiration: 60
|
||||||
|
|
Loading…
Reference in New Issue