openstack/charm-magnum
Code Issues Proposed changes

Add 2023.2 Bobcat support

Browse Source 
* 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
* patch charmhelpers.core.hookenv.is_subordinate due to new
  release handlings in charms.openstack:
  fd042afdf1
* update charmcraft_channel to 2.x/stable

Change-Id: I16bd8d0a3afb0d31ed96cb4bbf89cbbc5b4a33fd
This commit is contained in:
Corey Bryant 2023-07-18 16:47:18 -04:00
parent 82b425c9dd
commit c35a31effc
11 changed files with 363 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charmcraft.yaml
View File

@ -22,9 +22,9 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.10"
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]

2
osci.yaml
View File

@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: magnum
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/stable

2
src/config.yaml
View File

@ -1,6 +1,6 @@
options:
openstack-origin:
default: antelope
default: bobcat
type: string
description: |
Repository from which to install. May be one of the following:

2
src/metadata.yaml
View File

@ -11,8 +11,8 @@ tags:
- openstack
series:
- jammy
- kinetic
- lunar
- mantic
subordinate: false
requires:
shared-db:

2
src/tests/bundles/jammy-antelope.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-antelope
local_overlay_enabled: False
local_overlay_enabled: True
series: jammy

4
src/tests/bundles/jammy-zed.yaml → src/tests/bundles/jammy-bobcat.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-zed
openstack-origin: &openstack-origin cloud:jammy-bobcat
local_overlay_enabled: False
local_overlay_enabled: True
series: jammy

2
src/tests/bundles/lunar-antelope.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
local_overlay_enabled: True
series: lunar

344
src/tests/bundles/mantic-bobcat.yaml Normal file
View File

@ -0,0 +1,344 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: True
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':
'9':
# the following machines are for nova-compute which needs more memory
# for the instances.
'10':
constraints: mem=4096M cores=4
'11':
constraints: mem=4096M cores=4
'12':
'13':
'14':
'15':
'16':
'17':
applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
keystone-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
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
magnum-mysql-router:
charm: ch:mysql-router
channel: latest/edge
heat-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
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
to:
- '4'
channel: latest/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
to:
- '5'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
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
to:
- '10'
- '11'
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '12'
channel: latest/edge
magnum:
charm: ../../../magnum.charm
num_units: 3
options:
openstack-origin: *openstack-origin
to:
- '13'
- '14'
- '15'
magnum-hacluster:
charm: ch:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
channel: latest/edge
heat:
charm: ch:heat
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
barbican:
charm: ch:barbican
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
relations:
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - '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:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:quantum-network-service'
- 'neutron-gateway:quantum-network-service'
- - '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:neutron-api'
- 'nova-cloud-controller:neutron-api'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'nova-compute:neutron-plugin'
- 'neutron-openvswitch:neutron-plugin'
- - 'rabbitmq-server:amqp'
- 'neutron-openvswitch:amqp'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:certificates'
- 'neutron-api:certificates'
- - 'vault:certificates'
- 'glance:certificates'
- - 'vault:certificates'
- 'keystone:certificates'
- - 'vault:certificates'
- 'nova-cloud-controller:certificates'
- - 'vault:certificates'
- 'placement:certificates'
- - 'magnum:shared-db'
- 'magnum-mysql-router:shared-db'
- - 'magnum-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'magnum:certificates'
- 'vault:certificates'
- - 'magnum:ha'
- 'magnum-hacluster:ha'
- - 'heat:amqp'
- 'rabbitmq-server:amqp'
- - 'heat:identity-service'
- 'keystone:identity-service'
- - 'heat:shared-db'
- 'heat-mysql-router:shared-db'
- - 'heat-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'heat:certificates'
- 'vault:certificates'
- - 'barbican:amqp'
- 'rabbitmq-server:amqp'
- - 'barbican:identity-service'
- 'keystone:identity-service'
- - 'barbican:shared-db'
- 'barbican-mysql-router:shared-db'
- - 'barbican-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'barbican:certificates'
- 'vault:certificates'

8
src/tests/tests.yaml
View File

@ -1,14 +1,15 @@
charm_name: magnum
smoke_bundles:
- jammy-zed
- jammy-antelope
gate_bundles:
- jammy-zed
- jammy-antelope
dev_bundles:
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize
@ -37,3 +38,4 @@ target_deploy_status:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat

2
unit_tests/test_lib_charm_openstack_magnum.py
View File

@ -23,6 +23,8 @@ class Helper(test_utils.PatchHelper):
def setUp(self):
super().setUp()
self.patch('charmhelpers.core.hookenv.is_subordinate',
return_value=False)
self.patch_release(magnum.MagnumCharm.release)

2
unit_tests/test_magnum_handlers.py
View File

@ -76,6 +76,8 @@ class TestMagnumHandlers(test_utils.PatchHelper):
def setUp(self):
super().setUp()
self.patch('charmhelpers.core.hookenv.is_subordinate',
return_value=False)
self.patch_release(magnum.MagnumCharm.release)
self.magnum_charm = mock.MagicMock()
self.patch_object(handlers.charm, 'provide_charm_instance',