openstack
/
charm-barbican-vault
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: I69547aba671c14902480fe3ee8bbc56cea1133a8
This commit is contained in:
Alex Kavanagh 2020-08-13 11:27:22 +01:00
parent 9dfa29ec4d
commit 9fdf164f37
11 changed files with 52 additions and 46 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-vault.git project=openstack/charm-barbican-vault.git
defaultbranch=stable/20.08

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

@ -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: 3 num_units: 3
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

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

@ -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: 3 num_units: 3
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

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

@ -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: 3 num_units: 3
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

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

@ -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: 3 num_units: 3
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

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

@ -22,14 +22,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
@ -39,7 +39,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
@ -47,7 +47,7 @@ applications:
- '3' - '3'
barbican: barbican:
charm: cs:~openstack-charmers-next/barbican charm: cs:~openstack-charmers/barbican
num_units: 3 num_units: 3
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -61,7 +61,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
@ -69,7 +69,7 @@ applications:
- '7' - '7'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '8' - '8'

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

@ -22,14 +22,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
@ -39,7 +39,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
@ -47,7 +47,7 @@ applications:
- '3' - '3'
barbican: barbican:
charm: cs:~openstack-charmers-next/barbican charm: cs:~openstack-charmers/barbican
num_units: 3 num_units: 3
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -61,7 +61,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
@ -69,7 +69,7 @@ applications:
- '7' - '7'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '8' - '8'

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

@ -22,14 +22,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
@ -39,7 +39,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
@ -47,7 +47,7 @@ applications:
- '3' - '3'
barbican: barbican:
charm: cs:~openstack-charmers-next/barbican charm: cs:~openstack-charmers/barbican
num_units: 3 num_units: 3
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -61,7 +61,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
@ -69,7 +69,7 @@ applications:
- '7' - '7'
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: cs:~openstack-charmers/vault
num_units: 1 num_units: 1
to: to:
- '8' - '8'

2
src/tests/bundles/overlays/local-charm-overlay.yaml.j2
View File

@ -3,7 +3,7 @@ applications:
options: options:
vip: '{{ TEST_VIP01 }}' vip: '{{ TEST_VIP01 }}'
barbican-hacluster: barbican-hacluster:
charm: cs:~openstack-charmers-next/hacluster charm: cs:~openstack-charmers/hacluster
relations: relations:
- - barbican:ha - - barbican:ha
- barbican-hacluster:ha - barbican-hacluster:ha

4
src/wheelhouse.txt
View File

@ -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.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 mock>=1.2
nose>=1.3.7 nose>=1.3.7
coverage>=3.6 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: # Revisit for removal / mock improvement:
netifaces # vault netifaces # vault