Add 2023.2 Bobcat support
* sync charm-helpers to classic charms * change openstack-origin/source default to bobcat * add mantic to metadata series * align testing with bobcat * add new bobcat bundles * add bobcat bundles to tests.yaml * add bobcat tests to osci.yaml * update build-on and run-on bases * drop kinetic * add hatchling to wheelhouse * update charmcraft_channel to 2.x/stable Change-Id: I4776086c3bb35d0fc4bd3ff4f808559b73270426
This commit is contained in:
parent
9b95a69b8e
commit
69e8fd81dc
|
@ -22,9 +22,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
- name: ubuntu
|
|
||||||
channel: "22.10"
|
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "23.04"
|
channel: "23.04"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.10"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
|
|
@ -6,4 +6,4 @@
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: barbican-vault
|
charm_build_name: barbican-vault
|
||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
charmcraft_channel: 2.1/stable
|
charmcraft_channel: 2.x/stable
|
||||||
|
|
|
@ -6,8 +6,8 @@ tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
|
||||||
- lunar
|
- lunar
|
||||||
|
- mantic
|
||||||
subordinate: true
|
subordinate: true
|
||||||
provides:
|
provides:
|
||||||
secrets:
|
secrets:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:jammy-zed
|
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
|
@ -0,0 +1,112 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
|
series: mantic
|
||||||
|
|
||||||
|
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':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
vault-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
barbican-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
|
||||||
|
|
||||||
|
barbican:
|
||||||
|
charm: ch:barbican
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
- '5'
|
||||||
|
- '6'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
barbican-vault:
|
||||||
|
charm: ../../../barbican-vault.charm
|
||||||
|
num_units: 0
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: ch:rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
vault:
|
||||||
|
charm: ch:vault
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'vault:shared-db'
|
||||||
|
- 'vault-mysql-router:shared-db'
|
||||||
|
- - 'vault-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'barbican:shared-db'
|
||||||
|
- 'barbican-mysql-router:shared-db'
|
||||||
|
- - 'barbican-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'keystone:identity-service'
|
||||||
|
- 'barbican:identity-service'
|
||||||
|
|
||||||
|
- - 'rabbitmq-server:amqp'
|
||||||
|
- 'barbican:amqp'
|
||||||
|
|
||||||
|
- - 'barbican-vault:secrets'
|
||||||
|
- 'barbican:secrets'
|
||||||
|
|
||||||
|
- - 'vault:secrets'
|
||||||
|
- 'barbican-vault:secrets-storage'
|
|
@ -1,11 +1,12 @@
|
||||||
charm_name: barbican-vault
|
charm_name: barbican-vault
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-zed
|
|
||||||
gate_bundles:
|
|
||||||
- jammy-zed
|
|
||||||
dev_bundles:
|
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
|
gate_bundles:
|
||||||
|
- jammy-antelope
|
||||||
|
dev_bundles:
|
||||||
|
- jammy-bobcat
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
- mantic-bobcat
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
barbican-vault:
|
barbican-vault:
|
||||||
workload-status: waiting
|
workload-status: waiting
|
||||||
|
@ -20,3 +21,4 @@ tests:
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
- mantic-bobcat
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
# Pin hvac for a consistent response type
|
# Pin hvac for a consistent response type
|
||||||
hvac==0.10.1
|
hvac==0.10.1
|
||||||
|
|
||||||
|
# Add hatchling and calver, needed by urllib3
|
||||||
|
hatchling<2,>=1.6.0
|
||||||
|
calver
|
||||||
|
|
||||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||||
|
|
||||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||||
|
|
Loading…
Reference in New Issue