openstack
/
charm-keystone-ldap
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: I25d0b1a44ac58333be3e8b09fcf182bff876fe5e
This commit is contained in:
Alex Kavanagh 2020-08-13 11:33:02 +01:00
parent 6ac9ddf3d7
commit a32810ec89
16 changed files with 48 additions and 42 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-keystone-ldap.git
defaultbranch=stable/20.08

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

@ -8,17 +8,17 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

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

@ -8,19 +8,19 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

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

@ -8,19 +8,19 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

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

@ -8,19 +8,19 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

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

@ -8,19 +8,19 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

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

@ -20,10 +20,10 @@ machines:
applications:
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
@ -33,7 +33,7 @@ applications:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -41,7 +41,7 @@ applications:
- '3'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
series: bionic
num_units: 1
to:

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

@ -20,10 +20,10 @@ machines:
applications:
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
@ -33,7 +33,7 @@ applications:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -41,7 +41,7 @@ applications:
- '3'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
series: bionic
to:

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

@ -20,10 +20,10 @@ machines:
applications:
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
@ -33,7 +33,7 @@ applications:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -41,7 +41,7 @@ applications:
- '3'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
series: bionic
to:

4
src/tests/bundles/trusty-mitaka.yaml
View File

@ -13,14 +13,14 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

6
src/tests/bundles/xenial-mitaka.yaml
View File

@ -8,17 +8,17 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

6
src/tests/bundles/xenial-ocata.yaml
View File

@ -8,19 +8,19 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

6
src/tests/bundles/xenial-pike.yaml
View File

@ -8,19 +8,19 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

6
src/tests/bundles/xenial-queens.yaml
View File

@ -8,19 +8,19 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
charm: cs:~openstack-charmers-next/ldap-test-fixture
num_units: 1
to:
- '2'

4
src/wheelhouse.txt Normal file
View File

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