openstack
/
charm-swift-storage
Code Issues Proposed changes

Updates for stable branch creation 21.01 

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.
Switch to using stable zaza branch.
Switch to using stable zaza-openstack-tests branch.

Change-Id: I1ee2853257fbe0401f24173b52c620c8005d0978
This commit is contained in:
Aurelien Lourot 2021-02-10 20:20:11 +01:00
parent 19d5010902
commit 4e106980e5
18 changed files with 76 additions and 74 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-swift-storage.git
defaultbranch=stable/21.01

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

4
test-requirements.txt
View File

@ -42,8 +42,8 @@ oslo.utils<=3.41.0;python_version<'3.6'
coverage>=4.5.2
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza;python_version>='3.0'
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'

8
tests/bundles/bionic-queens.yaml
View File

@ -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

8
tests/bundles/bionic-rocky.yaml
View File

@ -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

8
tests/bundles/bionic-stein.yaml
View File

@ -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

8
tests/bundles/bionic-train-gr-r1.yaml
View File

@ -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

2
tests/bundles/bionic-train-gr-r2.yaml
View File

@ -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

8
tests/bundles/bionic-train.yaml
View File

@ -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

8
tests/bundles/bionic-ussuri.yaml
View File

@ -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

18
tests/bundles/focal-ussuri.yaml
View File

@ -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

18
tests/bundles/focal-victoria.yaml
View File

@ -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

18
tests/bundles/groovy-victoria.yaml
View File

@ -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

6
tests/bundles/trusty-mitaka.yaml
View File

@ -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

8
tests/bundles/xenial-mitaka.yaml
View File

@ -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

8
tests/bundles/xenial-ocata.yaml
View File

@ -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

8
tests/bundles/xenial-pike.yaml
View File

@ -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

8
tests/bundles/xenial-queens.yaml
View File

@ -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