openstack
/
charm-swift-proxy
Code Issues Proposed changes

21.10 - Release 

Remove the "channel: candidate" from the func-test
bundles.

Change-Id: I140a11ed1fa5862fe35c894e017f697a89081952
This commit is contained in:
Alex Kavanagh 2021-10-21 14:49:41 +01:00
parent 2e12e24882
commit cb6e0adb23
18 changed files with 0 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,17 +14,14 @@ applications:
options:
dataset-size: 25%
max-connections: 1000
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -32,7 +29,6 @@ applications:
block-devices: 'cinder,10G'
options:
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -16,21 +16,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-rocky
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -39,7 +36,6 @@ applications:
options:
openstack-origin: cloud:bionic-rocky
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -16,21 +16,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-stein
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -39,7 +36,6 @@ applications:
options:
openstack-origin: cloud:bionic-stein
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -22,7 +22,6 @@ applications:
zone: 1
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
channel: candidate
swift-storage-region1-zone2:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -31,7 +30,6 @@ applications:
zone: 2
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
channel: candidate
swift-storage-region1-zone3:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -40,7 +38,6 @@ applications:
zone: 3
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
@ -48,21 +45,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-train
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
relations:
- - swift-proxy-region1:swift-storage
- swift-storage-region1-zone1:swift-storage

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

@ -22,7 +22,6 @@ applications:
zone: 1
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
channel: candidate
swift-storage-region2-zone2:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -31,7 +30,6 @@ applications:
zone: 2
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
channel: candidate
swift-storage-region2-zone3:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -40,7 +38,6 @@ applications:
zone: 3
block-device: /etc/swift/storage.img|2G
openstack-origin: cloud:bionic-train
channel: candidate
relations:
- - swift-proxy-region2:swift-storage
- swift-storage-region2-zone1:swift-storage

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

@ -16,21 +16,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-train
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -39,7 +36,6 @@ applications:
options:
openstack-origin: cloud:bionic-train
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -16,21 +16,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:bionic-ussuri
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -39,7 +36,6 @@ applications:
options:
openstack-origin: cloud:bionic-ussuri
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -21,10 +21,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -35,7 +33,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
expose: True
@ -45,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
swift-proxy:
charm: swift-proxy
@ -66,7 +62,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@ -78,7 +73,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
relations:

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

@ -21,10 +21,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -35,7 +33,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
expose: True
@ -45,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
swift-proxy:
charm: swift-proxy
@ -66,7 +62,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@ -78,7 +73,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
relations:

6
tests/bundles/focal-wallaby.yaml
View File

@ -21,10 +21,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -35,7 +33,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
expose: True
@ -45,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
swift-proxy:
charm: swift-proxy
@ -66,7 +62,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@ -78,7 +73,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
relations:

6
tests/bundles/focal-xena.yaml
View File

@ -21,10 +21,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -35,7 +33,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
expose: True
@ -45,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
swift-proxy:
charm: swift-proxy
@ -66,7 +62,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@ -78,7 +73,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
relations:

6
tests/bundles/hirsute-wallaby.yaml
View File

@ -21,10 +21,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -35,7 +33,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
expose: True
@ -45,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
swift-proxy:
charm: swift-proxy
@ -66,7 +62,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@ -78,7 +73,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
relations:

6
tests/bundles/impish-xena.yaml
View File

@ -21,10 +21,8 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@ -35,7 +33,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
expose: True
@ -45,7 +42,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
swift-proxy:
charm: swift-proxy
@ -66,7 +62,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@ -78,7 +73,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
relations:

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

@ -22,14 +22,12 @@ applications:
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -38,7 +36,6 @@ applications:
options:
openstack-origin: cloud:trusty-mitaka
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -14,17 +14,14 @@ applications:
options:
dataset-size: 25%
max-connections: 1000
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -32,7 +29,6 @@ applications:
block-devices: 'cinder,10G'
options:
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -16,21 +16,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:xenial-ocata
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -39,7 +36,6 @@ applications:
options:
openstack-origin: cloud:xenial-ocata
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -16,21 +16,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:xenial-pike
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -39,7 +36,6 @@ applications:
options:
openstack-origin: cloud:xenial-pike
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db

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

@ -16,21 +16,18 @@ applications:
dataset-size: 25%
max-connections: 1000
source: cloud:xenial-queens
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@ -39,7 +36,6 @@ applications:
options:
openstack-origin: cloud:xenial-queens
zone: 1
channel: candidate
relations:
- - keystone:shared-db
- percona-cluster:shared-db