openstack
/
charm-manila-generic
Code Issues Proposed changes

Branch updates to work with charmhub for stable/rocky 

Change-Id: I3f271910bb2beace4ecf1629273a1d074d8e8fa9
This commit is contained in:
Alex Kavanagh 2022-01-23 14:36:26 +00:00
parent dde5f46afd
commit 192bf2f090
19 changed files with 38 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -3,4 +3,4 @@ host=review.opendev.org
port=29418
project=openstack/charm-manila-generic.git
defaultbranch=stable/21.10
defaultbranch=stable/rocky

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

15
osci.yaml
View File

@ -1,17 +1,8 @@
- project:
templates:
- charm-unit-jobs
check:
jobs:
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- groovy-victoria
- hirsute-wallaby
- charm-unit-jobs-py36
- charm-rocky-functional-jobs
- charm-queens-functional-jobs
vars:
needs_charm_build: true
charm_build_name: manila-generic

2
src/config.yaml
View File

@ -1,6 +1,6 @@
options:
openstack-origin:
default: distro
default: rocky
type: string
description: |
Repository from which to install. May be one of the following:

5
src/metadata.yaml
View File

@ -15,12 +15,7 @@ description: |
tags:
- openstack
series:
- xenial
- bionic
- focal
- groovy
- hirsute
- impish
subordinate: true
provides:
manila-plugin:

12
src/tests/bundles/bionic-queens.yaml
View File

@ -1,23 +1,27 @@
series: bionic
services:
manila:
charm: cs:~openstack-charmers/manila
charm: ch:manila
num_units: 1
options:
default-share-backend: generic
channel: queens/edge
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
channel: 3.6/edge
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
charm: ch:percona-cluster
num_units: 1
channel: 5.7/edge
keystone:
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
channel: queens/edge
relations:
- - manila:manila-plugin

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

@ -3,30 +3,34 @@ options:
source: &source cloud:bionic-rocky
services:
manila:
charm: cs:~openstack-charmers/manila
charm: ch:manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
channel: rocky/edge
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *source
channel: 3.6/edge
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
charm: ch:percona-cluster
num_units: 1
options:
source: *source
channel: 5.7/edge
keystone:
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
channel: rocky/edge
relations:
- - manila:manila-plugin

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

@ -1,41 +0,0 @@
series: bionic
options:
source: &source cloud:bionic-stein
services:
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster

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

@ -1,41 +0,0 @@
series: bionic
options:
source: &source cloud:bionic-train
services:
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster

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

@ -1,41 +0,0 @@
series: bionic
options:
source: &source cloud:bionic-ussuri
services:
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster

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

@ -1,85 +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':
services:
manila-mysql-router:
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

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

@ -1,85 +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':
services:
manila-mysql-router:
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

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

@ -1,85 +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':
services:
manila-mysql-router:
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

85
src/tests/bundles/groovy-victoria.yaml
View File

@ -1,85 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: groovy
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':
services:
manila-mysql-router:
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

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

@ -1,85 +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':
services:
manila-mysql-router:
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

41
src/tests/bundles/xenial-pike.yaml
View File

@ -1,41 +0,0 @@
series: xenial
options:
source: &source cloud:xenial-pike
services:
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster

41
src/tests/bundles/xenial-queens.yaml
View File

@ -1,41 +0,0 @@
series: xenial
options:
source: &source cloud:xenial-queens
services:
manila:
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster

20
src/tests/tests.yaml
View File

@ -1,23 +1,13 @@
charm_name: manila-generic
gate_bundles:
- bionic-rocky
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- groovy-victoria
smoke_bundles:
- focal-ussuri
dev_bundles:
- xenial-pike
- xenial-queens
- bionic-rocky
- hirsute-wallaby
dev_bundles: []
target_deploy_status: {}
@ -26,7 +16,3 @@ tests:
configure:
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
tests_options:
force_deploy:
- hirsute-wallaby