Enable jammy-antelope voting and drop kinetic-zed tests
* Voting was turned on for jammy-antelope in the
project-template for charm-functional-jobs in zosci-config
* Voting for jammy-antelope bundles with non-standard names
is turned on in individual charms
* Kinetic-zed bundles/tests are removed
Change-Id: I88ab5103f91b7f4772820a2ab8096d6a431b26ad
(cherry picked from commit 6f860444b5
)
This commit is contained in:
parent
d58f97e191
commit
d0e93cf2ad
|
@ -1,180 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: kinetic
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: ch:mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: ch:ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: ch:ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
charm: ch:cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../cinder-backup.charm
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
cinder-ceph:
|
|
||||||
charm: ch:cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'cinder-backup:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'cinder:storage-backend'
|
|
||||||
- 'cinder-ceph:storage-backend'
|
|
||||||
|
|
||||||
- - 'cinder:backup-backend'
|
|
||||||
- 'cinder-backup:backup-backend'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'glance:image-service'
|
|
||||||
- 'nova-compute:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph-access'
|
|
||||||
- 'cinder-ceph:ceph-access'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
|
@ -8,7 +8,6 @@ gate_bundles:
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
|
@ -16,5 +15,4 @@ tests:
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
|
Loading…
Reference in New Issue