openstack/charm-cinder-backup-swift-proxy
Code Issues Proposed changes

21.10 - Release

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

Change-Id: I1c853bbda0b9312d5ea47ffafd79154ed99848a4
This commit is contained in:
Alex Kavanagh
2021-10-21 14:49:40 +01:00
parent 0e1f37e999
commit f06ee91731
7 changed files with 0 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tests/bundles/bionic-queens-swift-v2.yaml
View File

@@ -61,24 +61,20 @@ applications:
num_units: 3
options:
monitor-count: '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
channel: candidate
cinder:
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
channel: candidate
cinder-ceph:
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
channel: candidate
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
num_units: 0
@@ -92,30 +88,24 @@ applications:
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
mysql:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate
# external swift
swift-keystone:
@@ -125,7 +115,6 @@ applications:
options:
admin-password: openstack
preferred-api-version: 3
channel: candidate
swift-mysql:
series: xenial
charm: cs:~openstack-charmers/percona-cluster
@@ -133,7 +122,6 @@ applications:
options:
dataset-size: 25%
max-connections: 1000
channel: candidate
swift-proxy:
series: xenial
charm: cs:~openstack-charmers/swift-proxy
@@ -141,7 +129,6 @@ applications:
options:
zone-assignment: manual
replicas: 1
channel: candidate
swift-storage:
series: xenial
charm: cs:~openstack-charmers/swift-storage
@@ -150,5 +137,4 @@ applications:
zone: 1
storage:
block-devices: 'cinder,10G'
channel: candidate

14
src/tests/bundles/bionic-queens-swift-v3.yaml
View File

@@ -61,24 +61,20 @@ applications:
num_units: 3
options:
monitor-count: '3'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
channel: candidate
cinder:
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
channel: candidate
cinder-ceph:
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
channel: candidate
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
num_units: 0
@@ -92,30 +88,24 @@ applications:
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
mysql:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
channel: candidate
# external swift
swift-keystone:
@@ -124,21 +114,18 @@ applications:
options:
admin-password: openstack
preferred-api-version: 3
channel: candidate
swift-mysql:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
channel: candidate
swift-proxy:
charm: cs:~openstack-charmers/swift-proxy
num_units: 1
options:
zone-assignment: manual
replicas: 1
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
num_units: 1
@@ -146,4 +133,3 @@ applications:
zone: 1
storage:
block-devices: 'cinder,10G'
channel: candidate

21
src/tests/bundles/focal-ussuri-swift-v3.yaml
View File

@@ -39,19 +39,14 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -62,7 +57,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@@ -74,7 +68,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@@ -88,7 +81,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
cinder:
charm: cs:~openstack-charmers/cinder
@@ -99,12 +91,10 @@ applications:
glance-api-version: 2
to:
- '12'
channel: candidate
cinder-ceph:
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
channel: candidate
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
@@ -124,7 +114,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@@ -133,7 +122,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
@@ -142,7 +130,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@@ -151,7 +138,6 @@ applications:
source: *openstack-origin
to:
- '16'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@@ -160,7 +146,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@@ -170,12 +155,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
# external swift
swift-keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
swift-mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -186,7 +169,6 @@ applications:
- '3'
- '4'
- '5'
channel: candidate
swift-keystone:
charm: cs:~openstack-charmers/keystone
@@ -197,7 +179,6 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: candidate
swift-proxy:
@@ -209,7 +190,6 @@ applications:
replicas: 1
to:
- '20'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@@ -221,7 +201,6 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: candidate
relations:

21
src/tests/bundles/focal-victoria-swift-v3.yaml
View File

@@ -39,19 +39,14 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -62,7 +57,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@@ -74,7 +68,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@@ -88,7 +81,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
cinder:
charm: cs:~openstack-charmers/cinder
@@ -99,12 +91,10 @@ applications:
glance-api-version: 2
to:
- '12'
channel: candidate
cinder-ceph:
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
channel: candidate
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
@@ -124,7 +114,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@@ -133,7 +122,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
@@ -142,7 +130,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@@ -151,7 +138,6 @@ applications:
source: *openstack-origin
to:
- '16'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@@ -160,7 +146,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@@ -170,12 +155,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
# external swift
swift-keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
swift-mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -186,7 +169,6 @@ applications:
- '3'
- '4'
- '5'
channel: candidate
swift-keystone:
charm: cs:~openstack-charmers/keystone
@@ -197,7 +179,6 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: candidate
swift-proxy:
@@ -209,7 +190,6 @@ applications:
replicas: 1
to:
- '20'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@@ -221,7 +201,6 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: candidate
relations:

21
src/tests/bundles/focal-wallaby-swift-v3.yaml
View File

@@ -39,19 +39,14 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -62,7 +57,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@@ -74,7 +68,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@@ -88,7 +81,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
cinder:
charm: cs:~openstack-charmers/cinder
@@ -99,12 +91,10 @@ applications:
glance-api-version: 2
to:
- '12'
channel: candidate
cinder-ceph:
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
channel: candidate
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
@@ -124,7 +114,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@@ -133,7 +122,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
@@ -142,7 +130,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@@ -151,7 +138,6 @@ applications:
source: *openstack-origin
to:
- '16'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@@ -160,7 +146,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@@ -170,12 +155,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
# external swift
swift-keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
swift-mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -186,7 +169,6 @@ applications:
- '3'
- '4'
- '5'
channel: candidate
swift-keystone:
charm: cs:~openstack-charmers/keystone
@@ -197,7 +179,6 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: candidate
swift-proxy:
@@ -209,7 +190,6 @@ applications:
replicas: 1
to:
- '20'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@@ -221,7 +201,6 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: candidate
relations:

21
src/tests/bundles/groovy-victoria-swift-v3.yaml
View File

@@ -39,19 +39,14 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -62,7 +57,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@@ -74,7 +68,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@@ -88,7 +81,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
cinder:
charm: cs:~openstack-charmers/cinder
@@ -99,12 +91,10 @@ applications:
glance-api-version: 2
to:
- '12'
channel: candidate
cinder-ceph:
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
channel: candidate
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
@@ -124,7 +114,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@@ -133,7 +122,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
@@ -142,7 +130,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@@ -151,7 +138,6 @@ applications:
source: *openstack-origin
to:
- '16'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@@ -160,7 +146,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@@ -170,12 +155,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
# external swift
swift-keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
swift-mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -186,7 +169,6 @@ applications:
- '3'
- '4'
- '5'
channel: candidate
swift-keystone:
charm: cs:~openstack-charmers/keystone
@@ -197,7 +179,6 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: candidate
swift-proxy:
@@ -209,7 +190,6 @@ applications:
replicas: 1
to:
- '20'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@@ -221,7 +201,6 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: candidate
relations:

21
src/tests/bundles/hirsute-wallaby-swift-v3.yaml
View File

@@ -39,19 +39,14 @@ applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -62,7 +57,6 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
@@ -74,7 +68,6 @@ applications:
- '6'
- '7'
- '8'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
@@ -88,7 +81,6 @@ applications:
- '9'
- '10'
- '11'
channel: candidate
cinder:
charm: cs:~openstack-charmers/cinder
@@ -99,12 +91,10 @@ applications:
glance-api-version: 2
to:
- '12'
channel: candidate
cinder-ceph:
charm: cs:~openstack-charmers/cinder-ceph
num_units: 0
channel: candidate
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
@@ -124,7 +114,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
keystone:
charm: cs:~openstack-charmers/keystone
@@ -133,7 +122,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
@@ -142,7 +130,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
@@ -151,7 +138,6 @@ applications:
source: *openstack-origin
to:
- '16'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers/nova-compute
@@ -160,7 +146,6 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: candidate
placement:
charm: cs:~openstack-charmers/placement
@@ -170,12 +155,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
# external swift
swift-keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
channel: candidate
swift-mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -186,7 +169,6 @@ applications:
- '3'
- '4'
- '5'
channel: candidate
swift-keystone:
charm: cs:~openstack-charmers/keystone
@@ -197,7 +179,6 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: candidate
swift-proxy:
@@ -209,7 +190,6 @@ applications:
replicas: 1
to:
- '20'
channel: candidate
swift-storage:
charm: cs:~openstack-charmers/swift-storage
@@ -221,7 +201,6 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: candidate
relations: