openstack/charm-magnum-dashboard
Code Issues Proposed changes

Migrate charm to charmhub latest/edge track

Browse Source 
Change-Id: I8bc87671803580644dff23c7834a9380e776d80b
This commit is contained in:
Alex Kavanagh 2022-01-27 14:18:06 +00:00
parent 8fe533c518
commit 6ed705d01f
14 changed files with 58 additions and 462 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

8
osci.yaml
View File

@ -1,11 +1,9 @@
- project: - project:
templates: templates:
- charm-yoga-unit-jobs - charm-unit-jobs-py38
- charm-yoga-functional-jobs - charm-unit-jobs-py39
- charm-xena-functional-jobs - charm-xena-functional-jobs
- charm-wallaby-functional-jobs - charm-yoga-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
vars: vars:
needs_charm_build: true needs_charm_build: true
charm_build_name: magnum-dashboard charm_build_name: magnum-dashboard

3
src/metadata.yaml
View File

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

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

@ -1,83 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-ussuri
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '1'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
magnum:
charm: cs:~openstack-charmers-next/magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
magnum-dashboard:
charm: ../../../magnum-dashboard
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

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

@ -1,86 +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
series: bionic
'1':
'2':
'3':
'4':
applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
series: bionic
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '1'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
magnum:
charm: cs:~openstack-charmers-next/magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
magnum-dashboard:
charm: ../../../magnum-dashboard
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

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

@ -1,86 +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
series: bionic
'1':
'2':
'3':
'4':
applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
series: bionic
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '1'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
magnum:
charm: cs:~openstack-charmers-next/magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
magnum-dashboard:
charm: ../../../magnum-dashboard
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

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

@ -1,86 +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
series: bionic
'1':
'2':
'3':
'4':
applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
series: bionic
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '1'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
magnum:
charm: cs:~openstack-charmers-next/magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
magnum-dashboard:
charm: ../../../magnum-dashboard
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

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

@ -19,7 +19,7 @@ applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: ch:percona-cluster
num_units: 1 num_units: 1
series: bionic series: bionic
options: options:
@ -27,37 +27,42 @@ applications:
innodb-buffer-pool-size: 256M innodb-buffer-pool-size: 256M
to: to:
- '0' - '0'
channel: latest/edge
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '1' - '1'
channel: latest/edge
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: ch:keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '2' - '2'
channel: latest/edge
magnum: magnum:
charm: cs:~openstack-charmers-next/magnum charm: ch:magnum
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
cert-manager-type: x509keypair cert-manager-type: x509keypair
to: to:
- '3' - '3'
channel: latest/edge
openstack-dashboard: openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard charm: ch:openstack-dashboard
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge
magnum-dashboard: magnum-dashboard:
charm: ../../../magnum-dashboard charm: ../../../magnum-dashboard

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

@ -19,7 +19,7 @@ applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: ch:percona-cluster
num_units: 1 num_units: 1
series: bionic series: bionic
options: options:
@ -27,37 +27,42 @@ applications:
innodb-buffer-pool-size: 256M innodb-buffer-pool-size: 256M
to: to:
- '0' - '0'
channel: latest/edge
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '1' - '1'
channel: latest/edge
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: ch:keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '2' - '2'
channel: latest/edge
magnum: magnum:
charm: cs:~openstack-charmers-next/magnum charm: ch:magnum
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
cert-manager-type: x509keypair cert-manager-type: x509keypair
to: to:
- '3' - '3'
channel: latest/edge
openstack-dashboard: openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard charm: ch:openstack-dashboard
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge
magnum-dashboard: magnum-dashboard:
charm: ../../../magnum-dashboard charm: ../../../magnum-dashboard

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

@ -1,86 +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
series: bionic
'1':
'2':
'3':
'4':
applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
series: bionic
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '1'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
magnum:
charm: cs:~openstack-charmers-next/magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
magnum-dashboard:
charm: ../../../magnum-dashboard
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

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

@ -19,7 +19,7 @@ applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: ch:percona-cluster
num_units: 1 num_units: 1
series: bionic series: bionic
options: options:
@ -27,37 +27,42 @@ applications:
innodb-buffer-pool-size: 256M innodb-buffer-pool-size: 256M
to: to:
- '0' - '0'
channel: latest/edge
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '1' - '1'
channel: latest/edge
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: ch:keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '2' - '2'
channel: latest/edge
magnum: magnum:
charm: cs:~openstack-charmers-next/magnum charm: ch:magnum
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
cert-manager-type: x509keypair cert-manager-type: x509keypair
to: to:
- '3' - '3'
channel: latest/edge
openstack-dashboard: openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard charm: ch:openstack-dashboard
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge
magnum-dashboard: magnum-dashboard:
charm: ../../../magnum-dashboard charm: ../../../magnum-dashboard

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

@ -19,7 +19,7 @@ applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster: percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: ch:percona-cluster
num_units: 1 num_units: 1
series: bionic series: bionic
options: options:
@ -27,37 +27,42 @@ applications:
innodb-buffer-pool-size: 256M innodb-buffer-pool-size: 256M
to: to:
- '0' - '0'
channel: latest/edge
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: ch:rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '1' - '1'
channel: latest/edge
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: ch:keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '2' - '2'
channel: latest/edge
magnum: magnum:
charm: cs:~openstack-charmers-next/magnum charm: ch:magnum
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
cert-manager-type: x509keypair cert-manager-type: x509keypair
to: to:
- '3' - '3'
channel: latest/edge
openstack-dashboard: openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard charm: ch:openstack-dashboard
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge
magnum-dashboard: magnum-dashboard:
charm: ../../../magnum-dashboard charm: ../../../magnum-dashboard

8
src/tests/tests.yaml
View File

@ -1,14 +1,9 @@
charm_name: magnum-dashboard charm_name: magnum-dashboard
smoke_bundles: smoke_bundles:
- focal-victoria - focal-xena
gate_bundles: gate_bundles:
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena - focal-xena
- hirsute-wallaby
- impish-xena - impish-xena
dev_bundles: dev_bundles:
@ -25,6 +20,5 @@ tests:
tests_options: tests_options:
force_deploy: force_deploy:
- hirsute-wallaby
- impish-xena - impish-xena
- jammy-yoga - jammy-yoga