openstack
/
charm-manila-dashboard
Code Issues Proposed changes

Migrate charm to charmhub latest/edge track 

Change-Id: Iadeaea7927b720ae6b5ad09ae929d46e06425351
This commit is contained in:
Alex Kavanagh 2022-01-27 14:48:57 +00:00
parent c0ad2b2d5f
commit 6ad6e06e29
15 changed files with 82 additions and 603 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:
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-yoga-functional-jobs
vars:
needs_charm_build: true
charm_build_name: manila-dashboard

3
src/metadata.yaml
View File

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

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

@ -1,82 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-train
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'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
manila-dashboard:
charm: ../../../manila-dashboard
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'manila:shared-db'
- 'percona-cluster:shared-db'
- - 'manila:amqp'
- 'rabbitmq-server:amqp'
- - 'manila:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'manila-dashboard:dashboard'

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

@ -1,82 +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'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
manila-dashboard:
charm: ../../../manila-dashboard
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'manila:shared-db'
- 'percona-cluster:shared-db'
- - 'manila:amqp'
- 'rabbitmq-server:amqp'
- - 'manila:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'manila-dashboard:dashboard'

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

@ -1,98 +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':
'6':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
manila-dashboard:
charm: ../../../manila-dashboard
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:amqp'
- 'rabbitmq-server:amqp'
- - 'manila:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'manila-dashboard:dashboard'

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

@ -1,98 +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':
'6':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
manila-dashboard:
charm: ../../../manila-dashboard
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:amqp'
- 'rabbitmq-server:amqp'
- - 'manila:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'manila-dashboard:dashboard'

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

@ -1,98 +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':
'6':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
manila-dashboard:
charm: ../../../manila-dashboard
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:amqp'
- 'rabbitmq-server:amqp'
- - 'manila:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'manila-dashboard:dashboard'

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

@ -19,14 +19,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -34,36 +37,41 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
manila:
charm: cs:~openstack-charmers-next/manila
charm: ch:manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
manila-dashboard:
charm: ../../../manila-dashboard

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

@ -19,14 +19,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -34,36 +37,41 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
manila:
charm: cs:~openstack-charmers-next/manila
charm: ch:manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
manila-dashboard:
charm: ../../../manila-dashboard

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

@ -1,98 +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':
'6':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
manila-dashboard:
charm: ../../../manila-dashboard
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:amqp'
- 'rabbitmq-server:amqp'
- - 'manila:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'manila-dashboard:dashboard'

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

@ -19,14 +19,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -34,36 +37,41 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
manila:
charm: cs:~openstack-charmers-next/manila
charm: ch:manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
manila-dashboard:
charm: ../../../manila-dashboard

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

@ -19,14 +19,17 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -34,36 +37,41 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
manila:
charm: cs:~openstack-charmers-next/manila
charm: ch:manila
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
manila-dashboard:
charm: ../../../manila-dashboard

8
src/tests/tests.yaml
View File

@ -1,18 +1,13 @@
charm_name: manila-dashboard
smoke_bundles:
- focal-ussuri
- focal-xena
gate_bundles:
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-xena
- hirsute-wallaby
- impish-xena
dev_bundles:
- bionic-train
- focal-yoga
- jammy-yoga
@ -29,6 +24,5 @@ tests:
tests_options:
force_deploy:
- hirsute-wallaby
- impish-xena
- jammy-yoga