Updates for caracal testing support
These updates, on the master branch, are to support testing the caracal packages and support of the charms for caracal. They do NOT lock the charms down, and don't change the testing branches to stable branches. Change-Id: I5d15739f7f0804323ec61629fea53fc13f638f34
This commit is contained in:
Alex Kavanagh
parent
39462317b6
commit
ba3ac4a1dc
@ -31,9 +31,3 @@ bases:
|
||||
- name: ubuntu
|
||||
channel: "22.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "23.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "23.10"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
|
||||
@ -545,7 +545,7 @@ class IdentityServiceContext(OSContextGenerator):
|
||||
'internal_auth_url': internal_auth_url,
|
||||
})
|
||||
|
||||
# we keep all veriables in ctxt for compatibility and
|
||||
# we keep all variables in ctxt for compatibility and
|
||||
# add nested dictionary for keystone_authtoken generic
|
||||
# templating
|
||||
if keystonemiddleware_os_release:
|
||||
@ -557,6 +557,7 @@ class IdentityServiceContext(OSContextGenerator):
|
||||
# NOTE(jamespage) this is required for >= icehouse
|
||||
# so a missing value just indicates keystone needs
|
||||
# upgrading
|
||||
ctxt['admin_user_id'] = _resolve('service_user_id')
|
||||
ctxt['admin_tenant_id'] = _resolve('service_tenant_id')
|
||||
ctxt['admin_domain_id'] = _resolve('service_domain_id')
|
||||
return ctxt
|
||||
|
||||
@ -161,6 +161,7 @@ OPENSTACK_CODENAMES = OrderedDict([
|
||||
('2022.2', 'zed'),
|
||||
('2023.1', 'antelope'),
|
||||
('2023.2', 'bobcat'),
|
||||
('2024.1', 'caracal'),
|
||||
])
|
||||
|
||||
# The ugly duckling - must list releases oldest to newest
|
||||
@ -416,17 +417,6 @@ def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES,
|
||||
error_out(e)
|
||||
|
||||
|
||||
def get_os_version_codename_swift(codename):
|
||||
'''Determine OpenStack version number of swift from codename.'''
|
||||
# for k, v in six.iteritems(SWIFT_CODENAMES):
|
||||
for k, v in SWIFT_CODENAMES.items():
|
||||
if k == codename:
|
||||
return v[-1]
|
||||
e = 'Could not derive swift version for '\
|
||||
'codename: %s' % codename
|
||||
error_out(e)
|
||||
|
||||
|
||||
def get_swift_codename(version):
|
||||
'''Determine OpenStack codename that corresponds to swift version.'''
|
||||
codenames = [k for k, v in SWIFT_CODENAMES.items() if version in v]
|
||||
@ -585,7 +575,6 @@ def get_installed_os_version():
|
||||
return openstack_release().get('OPENSTACK_CODENAME')
|
||||
|
||||
|
||||
@cached
|
||||
def openstack_release():
|
||||
"""Return /etc/os-release in a dict."""
|
||||
d = {}
|
||||
@ -847,14 +836,10 @@ def openstack_upgrade_available(package):
|
||||
if not cur_vers:
|
||||
# The package has not been installed yet do not attempt upgrade
|
||||
return False
|
||||
if "swift" in package:
|
||||
codename = get_os_codename_install_source(src)
|
||||
avail_vers = get_os_version_codename_swift(codename)
|
||||
else:
|
||||
try:
|
||||
avail_vers = get_os_version_install_source(src)
|
||||
except Exception:
|
||||
avail_vers = cur_vers
|
||||
try:
|
||||
avail_vers = get_os_version_install_source(src)
|
||||
except Exception:
|
||||
avail_vers = cur_vers
|
||||
apt.init()
|
||||
return apt.version_compare(avail_vers, cur_vers) >= 1
|
||||
|
||||
|
||||
@ -246,6 +246,14 @@ CLOUD_ARCHIVE_POCKETS = {
|
||||
'bobcat/proposed': 'jammy-proposed/bobcat',
|
||||
'jammy-bobcat/proposed': 'jammy-proposed/bobcat',
|
||||
'jammy-proposed/bobcat': 'jammy-proposed/bobcat',
|
||||
# caracal
|
||||
'caracal': 'jammy-updates/caracal',
|
||||
'jammy-caracal': 'jammy-updates/caracal',
|
||||
'jammy-caracal/updates': 'jammy-updates/caracal',
|
||||
'jammy-updates/caracal': 'jammy-updates/caracal',
|
||||
'caracal/proposed': 'jammy-proposed/caracal',
|
||||
'jammy-caracal/proposed': 'jammy-proposed/caracal',
|
||||
'jammy-proposed/caracal': 'jammy-proposed/caracal',
|
||||
|
||||
# OVN
|
||||
'focal-ovn-22.03': 'focal-updates/ovn-22.03',
|
||||
@ -279,6 +287,7 @@ OPENSTACK_RELEASES = (
|
||||
'zed',
|
||||
'antelope',
|
||||
'bobcat',
|
||||
'caracal',
|
||||
)
|
||||
|
||||
|
||||
@ -308,6 +317,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
|
||||
('kinetic', 'zed'),
|
||||
('lunar', 'antelope'),
|
||||
('mantic', 'bobcat'),
|
||||
('noble', 'caracal'),
|
||||
])
|
||||
|
||||
|
||||
|
||||
@ -5,13 +5,11 @@ description: |
|
||||
Cinder is the block storage service for the OpenStack.
|
||||
docs: https://discourse.charmhub.io/t/cinder-docs-index/10549
|
||||
tags:
|
||||
- openstack
|
||||
- storage
|
||||
- misc
|
||||
- openstack
|
||||
- storage
|
||||
- misc
|
||||
series:
|
||||
- jammy
|
||||
- lunar
|
||||
- mantic
|
||||
- jammy
|
||||
extra-bindings:
|
||||
public:
|
||||
admin:
|
||||
|
||||
@ -71,7 +71,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
@ -81,7 +81,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -102,7 +102,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
@ -112,7 +112,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -121,11 +121,11 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -143,7 +143,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
cinder:
|
||||
charm: ../../cinder.charm
|
||||
@ -163,7 +163,7 @@ applications:
|
||||
options:
|
||||
block-device: "/mnt/cinder-lvm-block|20G"
|
||||
config-flags: "target_helper=lioadm"
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
@ -81,7 +81,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -102,7 +102,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
@ -112,7 +112,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -121,11 +121,11 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -143,7 +143,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
cinder:
|
||||
charm: ../../cinder.charm
|
||||
@ -163,7 +163,7 @@ applications:
|
||||
options:
|
||||
block-device: "/mnt/cinder-lvm-block|20G"
|
||||
config-flags: "target_helper=lioadm"
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
openstack-origin: &openstack-origin cloud:jammy-caracal
|
||||
|
||||
series: mantic
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
@ -71,7 +71,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
@ -81,7 +81,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -102,7 +102,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
@ -112,7 +112,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -121,11 +121,11 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -143,7 +143,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
cinder:
|
||||
charm: ../../cinder.charm
|
||||
@ -163,7 +163,7 @@ applications:
|
||||
options:
|
||||
block-device: "/mnt/cinder-lvm-block|20G"
|
||||
config-flags: "target_helper=lioadm"
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: lunar
|
||||
series: noble
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
@ -71,7 +71,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
@ -81,7 +81,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -102,7 +102,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
@ -112,7 +112,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -121,11 +121,11 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -143,7 +143,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
cinder:
|
||||
charm: ../../cinder.charm
|
||||
@ -163,7 +163,7 @@ applications:
|
||||
options:
|
||||
block-device: "/mnt/cinder-lvm-block|20G"
|
||||
config-flags: "target_helper=lioadm"
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
@ -1,39 +1,35 @@
|
||||
charm_name: cinder
|
||||
|
||||
smoke_bundles:
|
||||
- jammy-antelope
|
||||
|
||||
- jammy-caracal
|
||||
gate_bundles:
|
||||
- jammy-antelope
|
||||
|
||||
- jammy-antelope
|
||||
- jammy-bobcat
|
||||
- jammy-caracal
|
||||
dev_bundles:
|
||||
- jammy-bobcat
|
||||
- lunar-antelope
|
||||
- mantic-bobcat
|
||||
|
||||
- noble-caracal
|
||||
target_deploy_status:
|
||||
vault:
|
||||
workload-status: blocked
|
||||
workload-status-message: Vault needs to be initialized
|
||||
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
||||
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||
- vault:
|
||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
||||
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||
- vault:
|
||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.cinder.tests.CinderTests
|
||||
- zaza.openstack.charm_tests.cinder.tests.SecurityTests
|
||||
- zaza.openstack.charm_tests.policyd.tests.CinderTests
|
||||
- zaza.openstack.charm_tests.cinder.tests.CinderTests
|
||||
- zaza.openstack.charm_tests.cinder.tests.SecurityTests
|
||||
- zaza.openstack.charm_tests.policyd.tests.CinderTests
|
||||
|
||||
tests_options:
|
||||
policyd:
|
||||
service: cinder
|
||||
force_deploy:
|
||||
- lunar-antelope
|
||||
- mantic-bobcat
|
||||
- noble-caracal
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user