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:
David Ames 2020-05-21 10:00:35 -07:00
parent 3198cf8529
commit 7b772cb8b6
15 changed files with 56 additions and 54 deletions

View File

@ -2,3 +2,5 @@
host=review.opendev.org host=review.opendev.org
port=29418 port=29418
project=openstack/charm-swift-storage.git project=openstack/charm-swift-storage.git
defaultbranch=stable/20.05

View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers repo: https://github.com/juju/charm-helpers@stable/20.05
destination: charmhelpers destination: charmhelpers
include: include:
- core - core

View File

@ -1,7 +1,7 @@
series: bionic series: bionic
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: bionic series: bionic
num_units: 1 num_units: 1
options: options:
@ -9,18 +9,18 @@ applications:
replicas: 1 replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
max-connections: 1000 max-connections: 1000
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
swift-storage: swift-storage:
charm: swift-storage charm: swift-storage

View File

@ -1,7 +1,7 @@
series: bionic series: bionic
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: bionic series: bionic
num_units: 1 num_units: 1
options: options:
@ -10,7 +10,7 @@ applications:
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
openstack-origin: cloud:bionic-rocky openstack-origin: cloud:bionic-rocky
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -18,13 +18,13 @@ applications:
source: cloud:bionic-rocky source: cloud:bionic-rocky
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-rocky openstack-origin: cloud:bionic-rocky
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-rocky openstack-origin: cloud:bionic-rocky

View File

@ -1,7 +1,7 @@
series: bionic series: bionic
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: bionic series: bionic
num_units: 1 num_units: 1
options: options:
@ -10,7 +10,7 @@ applications:
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
openstack-origin: cloud:bionic-stein openstack-origin: cloud:bionic-stein
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -18,13 +18,13 @@ applications:
source: cloud:bionic-stein source: cloud:bionic-stein
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-stein openstack-origin: cloud:bionic-stein
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-stein openstack-origin: cloud:bionic-stein

View File

@ -1,7 +1,7 @@
series: bionic series: bionic
applications: applications:
swift-proxy-region1: swift-proxy-region1:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
num_units: 1 num_units: 1
options: options:
region: RegionOne region: RegionOne
@ -38,7 +38,7 @@ applications:
block-device: /etc/swift/storage.img|2G block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train openstack-origin: cloud:bionic-train
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -46,13 +46,13 @@ applications:
source: cloud:bionic-train source: cloud:bionic-train
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-train openstack-origin: cloud:bionic-train
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-train openstack-origin: cloud:bionic-train

View File

@ -1,7 +1,7 @@
series: bionic series: bionic
applications: applications:
swift-proxy-region2: swift-proxy-region2:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
num_units: 1 num_units: 1
options: options:
region: RegionTwo region: RegionTwo

View File

@ -1,7 +1,7 @@
series: bionic series: bionic
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: bionic series: bionic
num_units: 1 num_units: 1
options: options:
@ -10,7 +10,7 @@ applications:
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
openstack-origin: cloud:bionic-train openstack-origin: cloud:bionic-train
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -18,13 +18,13 @@ applications:
source: cloud:bionic-train source: cloud:bionic-train
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-train openstack-origin: cloud:bionic-train
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-train openstack-origin: cloud:bionic-train

View File

@ -1,7 +1,7 @@
series: bionic series: bionic
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: bionic series: bionic
num_units: 1 num_units: 1
options: options:
@ -10,7 +10,7 @@ applications:
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
openstack-origin: cloud:bionic-ussuri openstack-origin: cloud:bionic-ussuri
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -18,13 +18,13 @@ applications:
source: cloud:bionic-ussuri source: cloud:bionic-ussuri
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-ussuri openstack-origin: cloud:bionic-ussuri
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-ussuri openstack-origin: cloud:bionic-ussuri

View File

@ -20,18 +20,18 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
glance-mysql-router: glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
cinder-mysql-router: cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
nova-cloud-controller-mysql-router: nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
placement-mysql-router: placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -42,7 +42,7 @@ applications:
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -50,7 +50,7 @@ applications:
- '3' - '3'
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
num_units: 1 num_units: 1
options: options:
zone-assignment: manual zone-assignment: manual
@ -62,7 +62,7 @@ applications:
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

View File

@ -1,7 +1,7 @@
series: trusty series: trusty
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: trusty series: trusty
num_units: 1 num_units: 1
options: options:
@ -18,13 +18,13 @@ applications:
source: cloud:trusty-mitaka source: cloud:trusty-mitaka
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:trusty-mitaka openstack-origin: cloud:trusty-mitaka
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:trusty-mitaka openstack-origin: cloud:trusty-mitaka

View File

@ -1,7 +1,7 @@
series: xenial series: xenial
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: xenial series: xenial
num_units: 1 num_units: 1
options: options:
@ -9,18 +9,18 @@ applications:
replicas: 1 replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
max-connections: 1000 max-connections: 1000
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
swift-storage: swift-storage:
charm: swift-storage charm: swift-storage

View File

@ -1,7 +1,7 @@
series: xenial series: xenial
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: xenial series: xenial
num_units: 1 num_units: 1
options: options:
@ -10,7 +10,7 @@ applications:
replicas: 1 replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -18,13 +18,13 @@ applications:
source: cloud:xenial-ocata source: cloud:xenial-ocata
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:xenial-ocata openstack-origin: cloud:xenial-ocata
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:xenial-ocata openstack-origin: cloud:xenial-ocata

View File

@ -1,7 +1,7 @@
series: xenial series: xenial
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: xenial series: xenial
num_units: 1 num_units: 1
options: options:
@ -10,7 +10,7 @@ applications:
replicas: 1 replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -18,13 +18,13 @@ applications:
source: cloud:xenial-pike source: cloud:xenial-pike
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:xenial-pike openstack-origin: cloud:xenial-pike
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:xenial-pike openstack-origin: cloud:xenial-pike

View File

@ -1,7 +1,7 @@
series: xenial series: xenial
applications: applications:
swift-proxy: swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy charm: cs:~openstack-charmers/swift-proxy
series: xenial series: xenial
num_units: 1 num_units: 1
options: options:
@ -10,7 +10,7 @@ applications:
replicas: 1 replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
dataset-size: 25% dataset-size: 25%
@ -18,13 +18,13 @@ applications:
source: cloud:xenial-queens source: cloud:xenial-queens
keystone: keystone:
expose: True expose: True
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:xenial-queens openstack-origin: cloud:xenial-queens
glance: glance:
expose: True expose: True
charm: cs:~openstack-charmers-next/glance charm: cs:~openstack-charmers/glance
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:xenial-queens openstack-origin: cloud:xenial-queens