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: I35599e9775624523add76965968a294930bb8879
This commit is contained in:
parent
5eb8923ec0
commit
b55d238c41
|
@ -2,3 +2,5 @@
|
||||||
host=review.opendev.org
|
host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-barbican-vault.git
|
project=openstack/charm-barbican-vault.git
|
||||||
|
|
||||||
|
defaultbranch=stable/20.05
|
||||||
|
|
|
@ -16,16 +16,16 @@ relations:
|
||||||
- barbican-vault:secrets-storage
|
- barbican-vault:secrets-storage
|
||||||
applications:
|
applications:
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
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
|
||||||
barbican:
|
barbican:
|
||||||
series: bionic
|
series: bionic
|
||||||
charm: cs:~openstack-charmers-next/barbican
|
charm: cs:~openstack-charmers/barbican
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky
|
openstack-origin: cloud:bionic-rocky
|
||||||
|
@ -34,8 +34,8 @@ applications:
|
||||||
charm: ../../../barbican-vault
|
charm: ../../../barbican-vault
|
||||||
num_units: 0
|
num_units: 0
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
vault:
|
vault:
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
|
|
@ -16,16 +16,16 @@ relations:
|
||||||
- barbican-vault:secrets-storage
|
- barbican-vault:secrets-storage
|
||||||
applications:
|
applications:
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
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
|
||||||
barbican:
|
barbican:
|
||||||
series: bionic
|
series: bionic
|
||||||
charm: cs:~openstack-charmers-next/barbican
|
charm: cs:~openstack-charmers/barbican
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-stein
|
openstack-origin: cloud:bionic-stein
|
||||||
|
@ -34,8 +34,8 @@ applications:
|
||||||
charm: ../../../barbican-vault
|
charm: ../../../barbican-vault
|
||||||
num_units: 0
|
num_units: 0
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
vault:
|
vault:
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
|
|
@ -16,16 +16,16 @@ relations:
|
||||||
- barbican-vault:secrets-storage
|
- barbican-vault:secrets-storage
|
||||||
applications:
|
applications:
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
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
|
||||||
barbican:
|
barbican:
|
||||||
series: bionic
|
series: bionic
|
||||||
charm: cs:~openstack-charmers-next/barbican
|
charm: cs:~openstack-charmers/barbican
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-train
|
openstack-origin: cloud:bionic-train
|
||||||
|
@ -34,8 +34,8 @@ applications:
|
||||||
charm: ../../../barbican-vault
|
charm: ../../../barbican-vault
|
||||||
num_units: 0
|
num_units: 0
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
vault:
|
vault:
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
|
|
@ -16,15 +16,15 @@ relations:
|
||||||
- barbican-vault:secrets-storage
|
- barbican-vault:secrets-storage
|
||||||
applications:
|
applications:
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
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
|
||||||
barbican:
|
barbican:
|
||||||
charm: cs:~openstack-charmers-next/barbican
|
charm: cs:~openstack-charmers/barbican
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-ussuri
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
@ -32,8 +32,8 @@ applications:
|
||||||
charm: ../../../barbican-vault
|
charm: ../../../barbican-vault
|
||||||
num_units: 0
|
num_units: 0
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
vault:
|
vault:
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
|
|
@ -20,14 +20,14 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
vault-mysql-router:
|
vault-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
|
||||||
|
@ -37,7 +37,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
|
||||||
|
@ -45,7 +45,7 @@ applications:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
||||||
barbican:
|
barbican:
|
||||||
charm: cs:~openstack-charmers-next/barbican
|
charm: cs:~openstack-charmers/barbican
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -57,7 +57,7 @@ applications:
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -65,7 +65,7 @@ applications:
|
||||||
- '5'
|
- '5'
|
||||||
|
|
||||||
vault:
|
vault:
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
|
|
|
@ -1,2 +1,6 @@
|
||||||
# Pin hvac for a consistent response type
|
# Pin hvac for a consistent response type
|
||||||
hvac==0.10.1
|
hvac==0.10.1
|
||||||
|
|
||||||
|
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
|
||||||
|
|
Loading…
Reference in New Issue