openstack
/
charm-manila-generic
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch tests to stable.

Switch to using stable charm-helpers branch.

Switch to using stable charm.openstack branch.

Change-Id: I4d38bfbda7de9f11963842e87037b509839814ad
This commit is contained in:
Alex Kavanagh 2020-08-13 11:34:01 +01:00
parent dbba043c4b
commit 815b2c4d38
9 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-manila-generic.git
defaultbranch=stable/20.08

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

@ -1,7 +1,7 @@
series: bionic
services:
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -10,13 +10,13 @@ services:
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
relations:

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

@ -3,7 +3,7 @@ options:
source: &source cloud:bionic-rocky
services:
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -13,17 +13,17 @@ services:
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source

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

@ -3,7 +3,7 @@ options:
source: &source cloud:bionic-stein
services:
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -13,17 +13,17 @@ services:
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source

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

@ -3,7 +3,7 @@ options:
source: &source cloud:bionic-train
services:
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -13,17 +13,17 @@ services:
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source

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

@ -3,7 +3,7 @@ options:
source: &source cloud:xenial-pike
services:
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -13,17 +13,17 @@ services:
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source

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

@ -3,7 +3,7 @@ options:
source: &source cloud:xenial-queens
services:
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -13,17 +13,17 @@ services:
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source

4
src/wheelhouse.txt Normal file
View File

@ -0,0 +1,4 @@
git+https://opendev.org/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/20.08#egg=charmhelpers

2
test-requirements.txt
View File

@ -11,7 +11,7 @@ charms.reactive
mock>=1.2
nose>=1.3.7
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack
#
# Revisit for removal / mock improvement:
netifaces # vault