openstack
/
charm-glance-simplestreams-sync
Code Issues Proposed changes

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: I4321c97de6772fdad3ad4f785022634cc1494704
This commit is contained in:
Felipe Reyes 2022-12-06 12:51:20 -03:00
parent 289671d18f
commit 3dab025b43
3 changed files with 30 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/bundles/jammy-yoga.yaml
View File

@ -1,11 +1,8 @@
variables:
source: &source distro
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
@ -24,38 +21,30 @@ machines:
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: edge
vault:
charm: ch:vault
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
@ -64,7 +53,6 @@ applications:
to:
- '4'
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
@ -73,7 +61,6 @@ applications:
to:
- '5'
channel: latest/edge
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync.charm
num_units: 1
@ -81,7 +68,6 @@ applications:
snap-channel: edge
to:
- '6'
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@ -90,7 +76,6 @@ applications:
to:
- '7'
channel: latest/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -103,7 +88,6 @@ applications:
- '9'
- '10'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@ -114,20 +98,19 @@ applications:
- '12'
- '13'
channel: latest/edge
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['keystone:shared-db', 'keystone-mysql-router:shared-db']
- ['glance:shared-db', 'glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault:shared-db', 'vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']

37
tests/bundles/jammy-zed.yaml
View File

@ -1,11 +1,8 @@
variables:
source: &source cloud:jammy-zed
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
@ -24,38 +21,30 @@ machines:
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: edge
vault:
charm: ch:vault
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
@ -64,7 +53,6 @@ applications:
to:
- '4'
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
@ -73,7 +61,6 @@ applications:
to:
- '5'
channel: latest/edge
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync.charm
options:
@ -81,7 +68,6 @@ applications:
num_units: 1
to:
- '6'
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@ -90,7 +76,6 @@ applications:
to:
- '7'
channel: latest/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -103,7 +88,6 @@ applications:
- '9'
- '10'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@ -114,20 +98,19 @@ applications:
- '12'
- '13'
channel: latest/edge
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['keystone:shared-db', 'keystone-mysql-router:shared-db']
- ['glance:shared-db', 'glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault:shared-db', 'vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']

37
tests/bundles/kinetic-zed.yaml
View File

@ -1,11 +1,8 @@
variables:
source: &source distro
series: kinetic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
@ -24,38 +21,30 @@ machines:
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: edge
vault:
charm: ch:vault
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
@ -64,7 +53,6 @@ applications:
to:
- '4'
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
@ -73,7 +61,6 @@ applications:
to:
- '5'
channel: latest/edge
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync.charm
options:
@ -81,7 +68,6 @@ applications:
num_units: 1
to:
- '6'
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@ -90,7 +76,6 @@ applications:
to:
- '7'
channel: latest/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -103,7 +88,6 @@ applications:
- '9'
- '10'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@ -114,20 +98,19 @@ applications:
- '12'
- '13'
channel: latest/edge
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['keystone:shared-db', 'keystone-mysql-router:shared-db']
- ['glance:shared-db', 'glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault:shared-db', 'vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router', 'mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']