openstack
/
charm-octavia-diskimage-retrofit
Code Issues Proposed changes

Migrate charm to charmhub latest/edge track 

Change-Id: Ib3dc50d00c36ee20ef73b9ed14cff6b7a348ba45
This commit is contained in:
Alex Kavanagh 2022-01-27 15:48:42 +00:00
parent 79e9e915fc
commit 35f5e646a0
17 changed files with 66 additions and 828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
charmcraft.yaml Normal file
View File

@ -0,0 +1,13 @@
type: charm
parts:
charm:
source: src/
plugin: reactive
build-snaps: [charm]
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64

1
metadata.yaml Symbolic link
View File

@ -0,0 +1 @@
src/metadata.yaml

9
osci.yaml
View File

@ -1,12 +1,9 @@
- project:
templates:
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-stein-functional-jobs
- charm-yoga-functional-jobs
vars:
needs_charm_build: true
charm_build_name: octavia-diskimage-retrofit

3
src/metadata.yaml
View File

@ -6,10 +6,7 @@ description: |
tags:
- openstack
series:
- bionic
- focal
- groovy
- hirsute
- impish
subordinate: true
requires:

74
src/tests/bundles/bionic-rocky.yaml
View File

@ -1,74 +0,0 @@
series: bionic
relations:
- - glance-simplestreams-sync:juju-info
- octavia-diskimage-retrofit:juju-info
- - mysql:shared-db
- keystone:shared-db
- - mysql:shared-db
- glance:shared-db
- - keystone:identity-service
- glance:identity-service
- - keystone:identity-service
- glance-simplestreams-sync:identity-service
- - keystone:identity-credentials
- octavia-diskimage-retrofit:identity-credentials
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
octavia-diskimage-retrofit:
series: bionic
charm: ../../../octavia-diskimage-retrofit
options:
retrofit-series: bionic
retrofit-uca-pocket: rocky

74
src/tests/bundles/bionic-stein.yaml
View File

@ -1,74 +0,0 @@
series: bionic
relations:
- - glance-simplestreams-sync:juju-info
- octavia-diskimage-retrofit:juju-info
- - mysql:shared-db
- keystone:shared-db
- - mysql:shared-db
- glance:shared-db
- - keystone:identity-service
- glance:identity-service
- - keystone:identity-service
- glance-simplestreams-sync:identity-service
- - keystone:identity-credentials
- octavia-diskimage-retrofit:identity-credentials
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
octavia-diskimage-retrofit:
series: bionic
charm: ../../../octavia-diskimage-retrofit
options:
retrofit-series: bionic
retrofit-uca-pocket: stein

74
src/tests/bundles/bionic-train.yaml
View File

@ -1,74 +0,0 @@
series: bionic
relations:
- - glance-simplestreams-sync:juju-info
- octavia-diskimage-retrofit:juju-info
- - mysql:shared-db
- keystone:shared-db
- - mysql:shared-db
- glance:shared-db
- - keystone:identity-service
- glance:identity-service
- - keystone:identity-service
- glance-simplestreams-sync:identity-service
- - keystone:identity-credentials
- octavia-diskimage-retrofit:identity-credentials
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-train
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
octavia-diskimage-retrofit:
series: bionic
charm: ../../../octavia-diskimage-retrofit
options:
retrofit-series: bionic
retrofit-uca-pocket: train

75
src/tests/bundles/bionic-ussuri.yaml
View File

@ -1,75 +0,0 @@
series: bionic
relations:
- - glance-simplestreams-sync:juju-info
- octavia-diskimage-retrofit:juju-info
- - mysql:shared-db
- keystone:shared-db
- - mysql:shared-db
- glance:shared-db
- - keystone:identity-service
- glance:identity-service
- - keystone:identity-service
- glance-simplestreams-sync:identity-service
- - keystone:identity-credentials
- octavia-diskimage-retrofit:identity-credentials
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri/proposed
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri/proposed
# NOTE(fnordahl): We deliberately do not include Focal here to confirm that
# the charm defaults work.
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
# NOTE(fnordahl): We deliberately do not include retrofit-series and uca
# pocket configuration options here to confirm that the charm defaults work.
octavia-diskimage-retrofit:
series: bionic
charm: ../../../octavia-diskimage-retrofit

122
src/tests/bundles/focal-ussuri.yaml
View File

@ -1,122 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: focal
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':
applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
to:
- '5'
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit
options:
retrofit-series: focal
relations:
- - 'glance-simplestreams-sync:juju-info'
- 'octavia-diskimage-retrofit:juju-info'
- - 'keystone-mysql-router:shared-db'
- 'keystone:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:shared-db'
- 'glance:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'glance:identity-service'
- - 'keystone:identity-service'
- 'glance-simplestreams-sync:identity-service'
- - 'keystone:identity-credentials'
- 'octavia-diskimage-retrofit:identity-credentials'

122
src/tests/bundles/focal-victoria.yaml
View File

@ -1,122 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
series: focal
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':
applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
to:
- '5'
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit
options:
retrofit-series: focal
relations:
- - 'glance-simplestreams-sync:juju-info'
- 'octavia-diskimage-retrofit:juju-info'
- - 'keystone-mysql-router:shared-db'
- 'keystone:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:shared-db'
- 'glance:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'glance:identity-service'
- - 'keystone:identity-service'
- 'glance-simplestreams-sync:identity-service'
- - 'keystone:identity-credentials'
- 'octavia-diskimage-retrofit:identity-credentials'

122
src/tests/bundles/focal-wallaby.yaml
View File

@ -1,122 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
series: focal
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':
applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
to:
- '5'
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit
options:
retrofit-series: focal
relations:
- - 'glance-simplestreams-sync:juju-info'
- 'octavia-diskimage-retrofit:juju-info'
- - 'keystone-mysql-router:shared-db'
- 'keystone:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:shared-db'
- 'glance:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'glance:identity-service'
- - 'keystone:identity-service'
- 'glance-simplestreams-sync:identity-service'
- - 'keystone:identity-credentials'
- 'octavia-diskimage-retrofit:identity-credentials'

18
src/tests/bundles/focal-xena.yaml
View File

@ -20,7 +20,7 @@ applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,30 +28,35 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
charm: ch:glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
@ -91,6 +96,7 @@ applications:
# }]"
to:
- '5'
channel: latest/edge
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit

18
src/tests/bundles/focal-yoga.yaml
View File

@ -20,7 +20,7 @@ applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,30 +28,35 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
charm: ch:glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
@ -91,6 +96,7 @@ applications:
# }]"
to:
- '5'
channel: latest/edge
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit

122
src/tests/bundles/hirsute-wallaby.yaml
View File

@ -1,122 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: hirsute
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':
applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
use_swift: False
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
name_prefix: 'ubuntu:released',
path: 'streams/v1/index.sjson',
max: 1,
item_filters: [
'release~(xenial|bionic|focal)',
'arch~(x86_64|amd64)',
'ftype~(disk1.img|disk.img)'
]
}]"
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
# is fixed.
#
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# },
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
# name_prefix: 'ubuntu:released',
# path: 'streams/v1/index.sjson',
# max: 1,
# item_filters: [
# 'release~(xenial|bionic|focal)',
# 'arch~(x86_64|amd64)',
# 'ftype~(disk1.img|disk.img)'
# ]
# }]"
to:
- '5'
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit
options:
retrofit-series: focal
relations:
- - 'glance-simplestreams-sync:juju-info'
- 'octavia-diskimage-retrofit:juju-info'
- - 'keystone-mysql-router:shared-db'
- 'keystone:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:shared-db'
- 'glance:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'glance:identity-service'
- - 'keystone:identity-service'
- 'glance-simplestreams-sync:identity-service'
- - 'keystone:identity-credentials'
- 'octavia-diskimage-retrofit:identity-credentials'

18
src/tests/bundles/impish-xena.yaml
View File

@ -20,7 +20,7 @@ applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,30 +28,35 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
charm: ch:glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
@ -91,6 +96,7 @@ applications:
# }]"
to:
- '5'
channel: latest/edge
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit

18
src/tests/bundles/jammy-yoga.yaml
View File

@ -20,7 +20,7 @@ applications:
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,30 +28,35 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
glance-simplestreams-sync:
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
charm: ch:glance-simplestreams-sync
num_units: 1
options:
source: ppa:simplestreams-dev/trunk
@ -91,6 +96,7 @@ applications:
# }]"
to:
- '5'
channel: latest/edge
octavia-diskimage-retrofit:
charm: ../../../octavia-diskimage-retrofit

11
src/tests/tests.yaml
View File

@ -1,21 +1,13 @@
charm_name: octavia-diskimage-retrofit
smoke_bundles:
- focal-ussuri
- focal-xena
gate_bundles:
- bionic-stein
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena
- hirsute-wallaby
- impish-xena
dev_bundles:
- bionic-rocky
- bionic-train
- focal-yoga
- jammy-yoga
@ -32,6 +24,5 @@ tests:
tests_options:
force_deploy:
- hirsute-wallaby
- impish-xena
- jammy-yoga