Add Antelope support
* sync charm-helpers to classic charms * change openstack-origin/source default to antelope * align testing with antelope * add new antelope bundles * add antelope bundles to tests.yaml * add antelope tests to osci.yaml and .zuul.yaml * update build-on and run-on bases Change-Id: I4645af85c618f3da2a9a8b4030e48ce25233a560
This commit is contained in:
parent
97ebbe3a8f
commit
067f4aea69
@ -1,4 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-zed-jobs
|
- openstack-python3-charm-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
@ -32,3 +32,6 @@ bases:
|
|||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
@ -18,6 +18,7 @@ tags:
|
|||||||
series:
|
series:
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
- kinetic
|
||||||
|
- lunar
|
||||||
subordinate: true
|
subordinate: true
|
||||||
provides:
|
provides:
|
||||||
manila-plugin:
|
manila-plugin:
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# More work is needed on the functional jobs; they can't pass at the
|
# More work is needed on the functional jobs; they can't pass at the
|
||||||
# moment as they need to set up hardware which isn't implemented yet.
|
# moment as they need to set up hardware which isn't implemented yet.
|
||||||
# See LP: #1922214
|
# See LP: #1922214
|
||||||
# - charm-zed-functional-jobs
|
# - charm-functional-jobs
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: manila-netapp
|
charm_build_name: manila-netapp
|
||||||
|
@ -3,9 +3,7 @@
|
|||||||
# choices of *requirements.txt files for OpenStack Charms:
|
# choices of *requirements.txt files for OpenStack Charms:
|
||||||
# https://github.com/openstack-charmers/release-tools
|
# https://github.com/openstack-charmers/release-tools
|
||||||
#
|
#
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
|
||||||
# Lint and unit test requirements
|
|
||||||
flake8>=2.2.4
|
|
||||||
|
|
||||||
stestr>=2.2.0
|
stestr>=2.2.0
|
||||||
|
|
||||||
@ -23,24 +21,21 @@ coverage>=3.6
|
|||||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||||
#
|
#
|
||||||
# Revisit for removal / mock improvement:
|
# Revisit for removal / mock improvement:
|
||||||
|
#
|
||||||
|
# NOTE(lourot): newer versions of cryptography require a Rust compiler to build,
|
||||||
|
# see
|
||||||
|
# * https://github.com/openstack-charmers/zaza/issues/421
|
||||||
|
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
|
||||||
|
#
|
||||||
netifaces # vault
|
netifaces # vault
|
||||||
psycopg2-binary # vault
|
psycopg2-binary # vault
|
||||||
tenacity # vault
|
tenacity # vault
|
||||||
pbr # vault
|
pbr==5.6.0 # vault
|
||||||
cryptography # vault, keystone-saml-mellon
|
cryptography<3.4 # vault, keystone-saml-mellon
|
||||||
lxml # keystone-saml-mellon
|
lxml # keystone-saml-mellon
|
||||||
hvac # vault, barbican-vault
|
hvac # vault, barbican-vault
|
||||||
|
psutil # cinder-lvm
|
||||||
# pep8 requirements
|
|
||||||
charm-tools>=2.4.4
|
|
||||||
|
|
||||||
# Workaround until https://github.com/juju/charm-tools/pull/589 gets
|
|
||||||
# published
|
|
||||||
keyring<21
|
|
||||||
|
|
||||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
|
||||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||||
|
|
||||||
ops
|
ops
|
||||||
git+https://opendev.org/openstack/charm-ops-openstack#egg=ops_openstack
|
git+https://opendev.org/openstack/charm-ops-openstack#egg=ops_openstack
|
||||||
|
246
tests/bundles/jammy-antelope.yaml
Normal file
246
tests/bundles/jammy-antelope.yaml
Normal file
@ -0,0 +1,246 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:jammy-antelope
|
||||||
|
|
||||||
|
local_overlay_enabled: True
|
||||||
|
|
||||||
|
series: jammy
|
||||||
|
|
||||||
|
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':
|
||||||
|
# The following units are the nova compute units
|
||||||
|
'10':
|
||||||
|
constraints: mem=4G
|
||||||
|
'11':
|
||||||
|
constraints: mem=4G
|
||||||
|
'12':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
manila-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
neutron-api-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
nova-cloud-controller-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
glance-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
placement-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
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: ch:nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: ch:glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: ch:neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ch:neutron-openvswitch
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-gateway:
|
||||||
|
charm: ch:neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: ch:keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: ch:rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: ch:placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '9'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: ch:nova-compute
|
||||||
|
num_units: 2
|
||||||
|
storage:
|
||||||
|
ephemeral-device: '40G'
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
to:
|
||||||
|
- '10'
|
||||||
|
- '11'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
manila:
|
||||||
|
charm: ch:manila
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
default-share-backend: netapp-ontap
|
||||||
|
to:
|
||||||
|
- '12'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
manila-netapp:
|
||||||
|
charm: ../../manila-netapp.charm
|
||||||
|
options:
|
||||||
|
share-backend-name: netapp-ontap
|
||||||
|
driver-handles-share-servers: False
|
||||||
|
|
||||||
|
manila-netapp-dhss:
|
||||||
|
charm: ../../manila-netapp.charm
|
||||||
|
options:
|
||||||
|
share-backend-name: netapp-ontap-dhss
|
||||||
|
driver-handles-share-servers: True
|
||||||
|
|
||||||
|
relations:
|
||||||
|
- - 'manila:shared-db'
|
||||||
|
- 'manila-mysql-router:shared-db'
|
||||||
|
- - 'manila-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
- - 'manila'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
- - 'manila'
|
||||||
|
- 'keystone'
|
||||||
|
- - 'manila:manila-plugin'
|
||||||
|
- 'manila-netapp:manila-plugin'
|
||||||
|
- - 'manila:manila-plugin'
|
||||||
|
- 'manila-netapp-dhss:manila-plugin'
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'neutron-api-mysql-router:shared-db'
|
||||||
|
- - 'neutron-api-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
|
- 'neutron-gateway:neutron-plugin-api'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||||
|
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
||||||
|
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
|
||||||
|
- - 'neutron-gateway:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'placement-mysql-router:shared-db'
|
||||||
|
- - 'placement-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
- - 'placement:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'placement:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'placement:placement'
|
||||||
|
- 'nova-cloud-controller:placement'
|
@ -3,7 +3,7 @@ variables:
|
|||||||
|
|
||||||
local_overlay_enabled: True
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: jammy
|
series: lunar
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
@ -1,17 +1,17 @@
|
|||||||
charm_name: manila-netapp
|
charm_name: manila-netapp
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-yoga
|
- jammy-antelope
|
||||||
- jammy-zed
|
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
|
||||||
# WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See
|
# WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See
|
||||||
# rationale there.
|
# rationale there.
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
target_deploy_status: {}
|
target_deploy_status: {}
|
||||||
|
|
||||||
@ -32,4 +32,5 @@ tests:
|
|||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
|
||||||
|
2
tox.ini
2
tox.ini
@ -33,7 +33,7 @@ allowlist_externals =
|
|||||||
charmcraft
|
charmcraft
|
||||||
bash
|
bash
|
||||||
tox
|
tox
|
||||||
rename.sh
|
{toxinidir}/rename.sh
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user