Update bundles to use "edge" for mysql-* charms.
This change drops the use of the "8.0/edge" track for the mysql-* charms in favor of just "edge" as a workaround of charmhub/juju issue that makes "--force" not able of deploying those charms to a "base" that the charm doesn't advertise as supported. As part of this change also the 'source' config option override is being dropped from mysql-innodb-cluster and rabbitmq-server. Related-Bug: #1996794 Change-Id: Ie65332fa375a497f05e343f413d3984bdc66307a
This commit is contained in:
parent
f5a61e7c78
commit
9838ec1dbb
|
@ -1,8 +1,6 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series jammy
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
|
@ -23,41 +21,35 @@ machines:
|
|||
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: latest/edge
|
||||
channel: edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
|
||||
channel: edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
|
||||
channel: edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
|
@ -66,16 +58,12 @@ applications:
|
|||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
|
@ -84,7 +72,6 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
|
@ -95,7 +82,6 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
|
@ -106,7 +92,6 @@ applications:
|
|||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
|
@ -116,7 +101,6 @@ applications:
|
|||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
|
@ -125,7 +109,6 @@ applications:
|
|||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
|
@ -136,11 +119,9 @@ applications:
|
|||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
|
||||
heat:
|
||||
charm: ../../heat.charm
|
||||
num_units: 2
|
||||
|
@ -152,91 +133,66 @@ applications:
|
|||
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'
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:jammy-zed
|
||||
|
||||
series: &series jammy
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
|
@ -23,41 +21,35 @@ machines:
|
|||
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: latest/edge
|
||||
channel: edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
|
||||
channel: edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
|
||||
channel: edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
|
@ -66,16 +58,12 @@ applications:
|
|||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
|
@ -84,7 +72,6 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
|
@ -95,7 +82,6 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
|
@ -106,7 +92,6 @@ applications:
|
|||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
|
@ -116,7 +101,6 @@ applications:
|
|||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
|
@ -125,7 +109,6 @@ applications:
|
|||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
|
@ -136,11 +119,9 @@ applications:
|
|||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
|
||||
heat:
|
||||
charm: ../../heat.charm
|
||||
num_units: 2
|
||||
|
@ -152,91 +133,66 @@ applications:
|
|||
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'
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series kinetic
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
|
@ -23,41 +21,35 @@ machines:
|
|||
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: latest/edge
|
||||
channel: edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
|
||||
channel: edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
|
||||
channel: edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
|
@ -66,16 +58,12 @@ applications:
|
|||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
|
@ -84,7 +72,6 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
|
@ -95,7 +82,6 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
|
@ -106,7 +92,6 @@ applications:
|
|||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
|
@ -116,7 +101,6 @@ applications:
|
|||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
|
@ -125,7 +109,6 @@ applications:
|
|||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
|
@ -136,11 +119,9 @@ applications:
|
|||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
|
||||
heat:
|
||||
charm: ../../heat.charm
|
||||
num_units: 2
|
||||
|
@ -152,91 +133,66 @@ applications:
|
|||
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'
|
||||
|
|
Loading…
Reference in New Issue