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: Ifb25e5593ee08dda815078ac0a8e36917008842a
This commit is contained in:
Aurelien Lourot 2020-11-02 11:47:14 +01:00
parent 5d5d02ea89
commit 335bc82de3
13 changed files with 53 additions and 47 deletions

View File

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

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:

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

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

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

View File

@ -3,7 +3,7 @@ options:
source: &source cloud:bionic-ussuri
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

View File

@ -19,12 +19,12 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -34,7 +34,7 @@ services:
- '2'
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -48,7 +48,7 @@ services:
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: *openstack-origin
@ -56,7 +56,7 @@ services:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -19,12 +19,12 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -34,7 +34,7 @@ services:
- '2'
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -48,7 +48,7 @@ services:
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: *openstack-origin
@ -56,7 +56,7 @@ services:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -19,12 +19,12 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -34,7 +34,7 @@ services:
- '2'
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: generic
@ -48,7 +48,7 @@ services:
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: *openstack-origin
@ -56,7 +56,7 @@ services:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

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.10#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/20.10#egg=charmhelpers

View File

@ -12,7 +12,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.10#egg=charms.openstack
#
# Revisit for removal / mock improvement:
netifaces # vault