openstack
/
charm-barbican
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: I846aa36c57104f2dd754b73ce730517d74d66141
This commit is contained in:
David Ames 2020-05-21 09:52:41 -07:00
parent f5fa98bc07
commit 357c56786d
7 changed files with 23 additions and 17 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 host=review.opendev.org
port=29418 port=29418
project=openstack/charm-barbican.git project=openstack/charm-barbican.git
defaultbranch=stable/20.05

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

@ -10,13 +10,13 @@ machines:
applications: applications:
mysql: mysql:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
to: to:
- '0' - '0'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-rocky openstack-origin: cloud:bionic-rocky
@ -34,7 +34,7 @@ applications:
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '3' - '3'

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

@ -10,13 +10,13 @@ machines:
applications: applications:
mysql: mysql:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
to: to:
- '0' - '0'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-stein openstack-origin: cloud:bionic-stein
@ -34,7 +34,7 @@ applications:
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '3' - '3'

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

@ -10,13 +10,13 @@ machines:
applications: applications:
mysql: mysql:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
to: to:
- '0' - '0'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-train openstack-origin: cloud:bionic-train
@ -34,7 +34,7 @@ applications:
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '3' - '3'

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

@ -10,13 +10,13 @@ machines:
applications: applications:
mysql: mysql:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
to: to:
- '0' - '0'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: cloud:bionic-ussuri openstack-origin: cloud:bionic-ussuri
@ -34,7 +34,7 @@ applications:
- '2' - '2'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '3' - '3'

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

@ -17,12 +17,12 @@ machines:
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
barbican-mysql-router: barbican-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -32,7 +32,7 @@ applications:
- '2' - '2'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -50,7 +50,7 @@ applications:
- '4' - '4'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
to: to:
- '5' - '5'

4
src/wheelhouse.txt
View File

@ -1,3 +1,7 @@
jinja2 jinja2
psutil psutil
git+https://opendev.org/openstack/charms.openstack.git@stable/20.05#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/20.05#egg=charmhelpers