openstack
/
charm-vault
Code Issues Proposed changes

Updates for stable branch creation 21.01 

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.
Switch to using stable zaza branch.
Switch to using stable zaza-openstack-tests branch.

Change-Id: I884be93751032fe82ae789713e8b242388d6ef58
This commit is contained in:
Aurelien Lourot 2021-02-10 20:20:30 +01:00
parent 0b569e20e2
commit faa38e3e2f
9 changed files with 29 additions and 27 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-vault.git
defaultbranch=stable/21.01

4
src/test-requirements.txt
View File

@ -11,5 +11,5 @@ charm-tools>=2.4.4
keyring<21
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack

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

@ -5,21 +5,21 @@ services:
series: bionic
charm: vault
mysql:
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
options:
admin-password: openstack
openstack-origin: cloud:bionic-train
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: cloud:bionic-train
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:bionic-train

12
src/tests/bundles/focal-mysql8.yaml
View File

@ -24,12 +24,12 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
vault-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
@ -45,7 +45,7 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
admin-password: openstack
@ -54,7 +54,7 @@ applications:
- '4'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -64,7 +64,7 @@ applications:
- '7'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
osd-encrypt: true

12
src/tests/bundles/groovy-mysql8.yaml
View File

@ -24,12 +24,12 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
vault-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
@ -45,7 +45,7 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
admin-password: openstack
@ -54,7 +54,7 @@ applications:
- '4'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -64,7 +64,7 @@ applications:
- '7'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
osd-encrypt: true

4
src/tests/bundles/xenial-ha-mysql.yaml
View File

@ -7,9 +7,9 @@ services:
options:
vip: 'ADD YOUR VIP HERE'
hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
easyrsa:
charm: cs:~containers/easyrsa

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

@ -5,21 +5,21 @@ services:
series: xenial
charm: vault
mysql:
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
options:
admin-password: openstack
openstack-origin: cloud:xenial-queens
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: cloud:xenial-queens
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: cloud:xenial-queens

4
src/wheelhouse.txt
View File

@ -7,6 +7,6 @@ requests
psutil
git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
git+https://opendev.org/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git@stable/21.01#egg=charmhelpers

2
test-requirements.txt
View File

@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
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/21.01#egg=charms.openstack
#
# Revisit for removal / mock improvement:
netifaces # vault