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: Ifd14ee073ef69d37cd69e904df8ba102b333286c
This commit is contained in:
parent
3198cf8529
commit
7b772cb8b6
@ -2,3 +2,5 @@
|
||||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-swift-storage.git
|
||||
|
||||
defaultbranch=stable/20.05
|
||||
|
@ -1,4 +1,4 @@
|
||||
repo: https://github.com/juju/charm-helpers
|
||||
repo: https://github.com/juju/charm-helpers@stable/20.05
|
||||
destination: charmhelpers
|
||||
include:
|
||||
- core
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
@ -9,18 +9,18 @@ applications:
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
@ -10,7 +10,7 @@ applications:
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:bionic-rocky
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
@ -10,7 +10,7 @@ applications:
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: cloud:bionic-stein
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:bionic-stein
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: bionic
|
||||
applications:
|
||||
swift-proxy-region1:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
region: RegionOne
|
||||
@ -38,7 +38,7 @@ applications:
|
||||
block-device: /etc/swift/storage.img|2G
|
||||
openstack-origin: cloud:bionic-train
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -46,13 +46,13 @@ applications:
|
||||
source: cloud:bionic-train
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: bionic
|
||||
applications:
|
||||
swift-proxy-region2:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
region: RegionTwo
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
@ -10,7 +10,7 @@ applications:
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: cloud:bionic-train
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:bionic-train
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: bionic
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
@ -10,7 +10,7 @@ applications:
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:bionic-ussuri
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
|
@ -20,18 +20,18 @@ machines:
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
placement-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
|
||||
@ -42,7 +42,7 @@ applications:
|
||||
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
@ -50,7 +50,7 @@ applications:
|
||||
- '3'
|
||||
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
@ -62,7 +62,7 @@ applications:
|
||||
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: trusty
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: trusty
|
||||
num_units: 1
|
||||
options:
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:trusty-mitaka
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:trusty-mitaka
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:trusty-mitaka
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
@ -9,18 +9,18 @@ applications:
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
@ -10,7 +10,7 @@ applications:
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:xenial-ocata
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-ocata
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-ocata
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
@ -10,7 +10,7 @@ applications:
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:xenial-pike
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-pike
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-pike
|
||||
|
@ -1,7 +1,7 @@
|
||||
series: xenial
|
||||
applications:
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers-next/swift-proxy
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
series: xenial
|
||||
num_units: 1
|
||||
options:
|
||||
@ -10,7 +10,7 @@ applications:
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
@ -18,13 +18,13 @@ applications:
|
||||
source: cloud:xenial-queens
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
|
Loading…
Reference in New Issue
Block a user