openstack
/
charm-heat
Code Issues Proposed changes

Remove impish from metadata and tests and set default config 

- Remove impish metadata
- Remove impish tests
- Set the openstack-origin to cloud:focal-xena as a default

Change-Id: Ic7358adde8defe2f8c4f895388880e92d972a796
This commit is contained in:
Alex Kavanagh 2022-03-22 20:03:27 +00:00
parent 203d3b205e
commit 701503bf85
5 changed files with 3 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -14,7 +14,7 @@ options:
Setting this to True will allow supporting services to log to syslog.
openstack-origin:
type: string
default: distro
default: cloud:focal-xena
description: |
Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry,

1
metadata.yaml
View File

@ -9,7 +9,6 @@ tags:
- openstack
series:
- focal
- impish
extra-bindings:
public:
admin:

3
osci.yaml
View File

@ -1,13 +1,10 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py39
check:
jobs:
- focal-wallaby
- focal-xena
- impish-xena:
voting: false
vars:
needs_charm_build: true
charm_build_name: heat

244
tests/bundles/impish-xena.yaml
View File

@ -1,244 +0,0 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
series: &series impish
machines:
0:
constraints: "mem=3072M"
1:
constraints: "mem=3072M"
2:
constraints: "mem=3072M"
3:
4:
5:
6:
7:
constraints: "root-disk=20G mem=4G cores=4"
8:
9:
10:
11:
constaints: "mem=2048M"
12:
constaints: "mem=2048M"
# We specify machine placements for these to improve iteration
# time, given that machine "0" comes up way before machine "7"
applications:
heat-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
placement-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
glance-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: 8.0.19/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: xena/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: 3.8/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: xena/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
network-manager: Neutron
to:
- '6'
channel: xena/edge
nova-compute:
charm: ch:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
config-flags: 'auto_assign_floating_ip=False'
enable-live-migration: "False"
to:
- '7'
channel: xena/edge
placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
debug: "True"
to:
- '8'
channel: xena/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '9'
channel: xena/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
openstack-origin: *openstack-origin
to:
- '10'
channel: xena/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: xena/edge
heat:
charm: ../../heat.charm
num_units: 2
constraints: mem=2048
options:
openstack-origin: *openstack-origin
debug: "True"
verbose: "True"
to:
- '11'
- '12'
relations:
- - '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"
- - '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'
- - "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'
- - "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'

7
tests/tests.yaml
View File

@ -7,9 +7,7 @@ gate_bundles:
- focal-wallaby
- focal-xena
dev_bundles:
- trusty-mtaka
- impish-xena
dev_bundles: []
configure:
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
@ -23,5 +21,4 @@ tests:
tests_options:
policyd:
service: heat
force_deploy:
- impish-xena
force_deploy: []