openstack
/
charm-swift-proxy
Code Issues Proposed changes

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: I93651aa39cac1206ac0ee62121709c3bff532164
This commit is contained in:
Alex Kavanagh 2020-08-13 11:40:11 +01:00
parent 1e8a448d0e
commit 9860643234
17 changed files with 78 additions and 76 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-proxy.git
defaultbranch=stable/20.08

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

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

@ -9,21 +9,21 @@ 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: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -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,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -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,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -14,7 +14,7 @@ applications:
write-affinity-node-count: '1'
openstack-origin: cloud:bionic-train
swift-storage-region1-zone1:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
options:
storage-region: 1
@ -22,7 +22,7 @@ applications:
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
swift-storage-region1-zone2:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
options:
storage-region: 1
@ -30,7 +30,7 @@ applications:
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
swift-storage-region1-zone3:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
options:
storage-region: 1
@ -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

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

@ -14,7 +14,7 @@ applications:
write-affinity-node-count: '1'
openstack-origin: cloud:bionic-train
swift-storage-region2-zone1:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
options:
storage-region: 2
@ -22,7 +22,7 @@ applications:
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
swift-storage-region2-zone2:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
options:
storage-region: 2
@ -30,7 +30,7 @@ applications:
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
swift-storage-region2-zone3:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
options:
storage-region: 2

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

@ -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,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -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,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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
@ -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
@ -70,7 +70,7 @@ applications:
- '5'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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
@ -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
@ -70,7 +70,7 @@ applications:
- '5'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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
@ -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
@ -70,7 +70,7 @@ applications:
- '5'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -18,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -9,21 +9,21 @@ 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: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -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,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -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,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'

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

@ -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,18 +18,18 @@ 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
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
charm: cs:~openstack-charmers/swift-storage
num_units: 1
storage:
block-devices: 'cinder,10G'