Enable jammy-antelope voting and drop kinetic-zed tests
* Voting was turned on for jammy-antelope in the project-template for charm-functional-jobs in zosci-config * Voting for jammy-antelope bundles with non-standard names is turned on in individual charms * Kinetic-zed bundles/tests are removed * Add libpython3-dev to allow the charm to be built. This fixes a missing dependency with Cython Change-Id: I83b97c35b6e64050feaa94a2eee2b80fa49c2555
This commit is contained in:
parent
c1c0741322
commit
ea96987f11
@ -4,6 +4,8 @@ parts:
|
|||||||
charm:
|
charm:
|
||||||
source: src/
|
source: src/
|
||||||
plugin: reactive
|
plugin: reactive
|
||||||
|
build-packages:
|
||||||
|
- libpython3-dev
|
||||||
build-snaps:
|
build-snaps:
|
||||||
- charm
|
- charm
|
||||||
build-environment:
|
build-environment:
|
||||||
|
@ -1,310 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
local_overlay_enabled: False
|
|
||||||
|
|
||||||
series: kinetic
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: virt-type=kvm mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: virt-type=kvm mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: virt-type=kvm mem=3072M
|
|
||||||
'3':
|
|
||||||
constraints: virt-type=kvm mem=3072M
|
|
||||||
'4':
|
|
||||||
constraints: virt-type=kvm mem=3072M
|
|
||||||
'5':
|
|
||||||
constraints: virt-type=kvm mem=3072M
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
constraints: mem=4096M
|
|
||||||
'13':
|
|
||||||
'14':
|
|
||||||
'15':
|
|
||||||
'16':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
nova-cell-controller-cell2-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
options:
|
|
||||||
base-port: 3316
|
|
||||||
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
|
|
||||||
|
|
||||||
mysql-innodb-cluster-cell2:
|
|
||||||
charm: ch:mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
- '4'
|
|
||||||
- '5'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
worker-multiplier: 0.25
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
admin-password: openstack
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
worker-multiplier: 0.25
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
neutron-plugin: ovs
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
worker-multiplier: 0.25
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-gateway:
|
|
||||||
charm: ch:neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
worker-multiplier: 0.25
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
worker-multiplier: 0.25
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cell-controller-cell2:
|
|
||||||
charm: ../../../nova-cell-controller.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
worker-multiplier: 0.25
|
|
||||||
debug: true
|
|
||||||
cell-name: "cell2"
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
nova-compute-cell2:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 1
|
|
||||||
storage:
|
|
||||||
ephemeral-device: '40G'
|
|
||||||
options:
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server-nova:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server-nova-cell2:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '14'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server-neutron:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '15'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '16'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:nova-cell-api'
|
|
||||||
- 'nova-cell-controller-cell2:nova-cell-compute'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db-cell'
|
|
||||||
- 'nova-cell-controller-cell2-mysql-router:shared-db'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp-cell'
|
|
||||||
- 'rabbitmq-server-nova-cell2:amqp'
|
|
||||||
|
|
||||||
- - 'nova-compute-cell2:amqp'
|
|
||||||
- 'rabbitmq-server-nova-cell2:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server-neutron:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp-nova'
|
|
||||||
- 'rabbitmq-server-nova:amqp'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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-neutron:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server-neutron:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'nova-compute-cell2:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'nova-cell-controller-cell2:cloud-compute'
|
|
||||||
- 'nova-compute-cell2:cloud-compute'
|
|
||||||
|
|
||||||
- - 'nova-cell-controller-cell2:identity-credentials'
|
|
||||||
- 'keystone:identity-credentials'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server-nova:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cell-controller-cell2:amqp'
|
|
||||||
- 'rabbitmq-server-nova-cell2:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
|
|
||||||
- - 'nova-compute-cell2:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server-neutron: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-cell-controller-cell2:shared-db'
|
|
||||||
- 'nova-cell-controller-cell2-mysql-router:shared-db'
|
|
||||||
- - 'nova-cell-controller-cell2-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster-cell2:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:neutron-api'
|
|
||||||
- 'neutron-api:neutron-api'
|
|
||||||
|
|
||||||
- - 'nova-compute-cell2:cloud-credentials'
|
|
||||||
- 'keystone:identity-credentials'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'placement-mysql-router:shared-db'
|
|
||||||
- - 'placement-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:placement'
|
|
||||||
- 'placement:placement'
|
|
@ -15,7 +15,6 @@ gate_bundles:
|
|||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
@ -23,5 +22,4 @@ smoke_bundles:
|
|||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
Loading…
Reference in New Issue
Block a user