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 * Sync charm-helpers to pick up fix for os_requires_version() Change-Id: I9d44ab27409530e4690121e6ab7e3fdfeeda3071
This commit is contained in:
parent
bc9c435dbc
commit
f6212eac8b
|
@ -127,7 +127,9 @@ def deferred_events():
|
||||||
"""
|
"""
|
||||||
events = []
|
events = []
|
||||||
for defer_file in deferred_events_files():
|
for defer_file in deferred_events_files():
|
||||||
events.append((defer_file, read_event_file(defer_file)))
|
event = read_event_file(defer_file)
|
||||||
|
if event.policy_requestor_name == hookenv.service_name():
|
||||||
|
events.append((defer_file, event))
|
||||||
return events
|
return events
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,4 +22,6 @@ signing_dir = {{ signing_dir }}
|
||||||
{% if use_memcache == true %}
|
{% if use_memcache == true %}
|
||||||
memcached_servers = {{ memcache_url }}
|
memcached_servers = {{ memcache_url }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
service_token_roles = {{ admin_role }}
|
||||||
|
service_token_roles_required = True
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
|
@ -957,7 +957,7 @@ def os_requires_version(ostack_release, pkg):
|
||||||
def wrap(f):
|
def wrap(f):
|
||||||
@wraps(f)
|
@wraps(f)
|
||||||
def wrapped_f(*args):
|
def wrapped_f(*args):
|
||||||
if os_release(pkg) < ostack_release:
|
if CompareOpenStackReleases(os_release(pkg)) < ostack_release:
|
||||||
raise Exception("This hook is not supported on releases"
|
raise Exception("This hook is not supported on releases"
|
||||||
" before %s" % ostack_release)
|
" before %s" % ostack_release)
|
||||||
f(*args)
|
f(*args)
|
||||||
|
|
|
@ -1,189 +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':
|
|
||||||
'14':
|
|
||||||
'15':
|
|
||||||
'16':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: ch:mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: ch:ceph-osd
|
|
||||||
num_units: 6
|
|
||||||
storage:
|
|
||||||
osd-devices: '10G'
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
- '4'
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-radosgw:
|
|
||||||
charm: ch:ceph-radosgw
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '15'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: ch:ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
monitor-count: '3'
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
- '11'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
expose: True
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
expose: True
|
|
||||||
charm: ../../glance.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
pool-type: erasure-coded
|
|
||||||
ec-profile-k: 4
|
|
||||||
ec-profile-m: 2
|
|
||||||
ec-profile-plugin: jerasure
|
|
||||||
to:
|
|
||||||
- '14'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
expose: True
|
|
||||||
charm: ch:cinder
|
|
||||||
num_units: 1
|
|
||||||
storage:
|
|
||||||
block-devices: '10G'
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
glance-api-version: 2
|
|
||||||
block-device: None
|
|
||||||
to:
|
|
||||||
- '16'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
cinder-lvm:
|
|
||||||
charm: ch:cinder-lvm
|
|
||||||
options:
|
|
||||||
block-device: '/tmp/vol1|4G'
|
|
||||||
alias: zaza-lvm
|
|
||||||
overwrite: "true"
|
|
||||||
ephemeral-unmount: /mnt
|
|
||||||
allocation-type: auto
|
|
||||||
config-flags: target_helper=lioadm
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'glance:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'ceph-radosgw:mon'
|
|
||||||
- 'ceph-mon:radosgw'
|
|
||||||
- - 'ceph-radosgw:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'ceph-radosgw:object-store'
|
|
||||||
- 'glance:object-store'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'cinder:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'cinder:cinder-volume-service'
|
|
||||||
- 'glance:cinder-volume-service'
|
|
||||||
- - 'cinder-lvm:storage-backend'
|
|
||||||
- 'cinder:storage-backend'
|
|
|
@ -11,7 +11,6 @@ gate_bundles:
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
|
||||||
configure:
|
configure:
|
||||||
|
@ -44,5 +43,4 @@ tests_options:
|
||||||
policyd:
|
policyd:
|
||||||
service: glance
|
service: glance
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
|
Loading…
Reference in New Issue