openstack
/
charm-designate
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: Ie0565428914a4b0c26458508498d0347845f730a
This commit is contained in:
Alex Kavanagh 2020-08-13 11:30:50 +01:00
parent 0d8cdb3597
commit 775b3d3c77
16 changed files with 80 additions and 74 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-designate.git
defaultbranch=stable/20.08

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

@ -12,27 +12,27 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,31 +12,31 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,31 +12,31 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,31 +12,31 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,7 +12,7 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -20,24 +20,24 @@ applications:
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -21,14 +21,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
designate-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
neutron-api-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
@ -38,7 +38,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -46,7 +46,7 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -54,7 +54,7 @@ applications:
- '4'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -63,7 +63,7 @@ applications:
- '5'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
# NOTE(ajkavanagh) apparently it has no openstack origin!
#options:

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

@ -21,14 +21,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
designate-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
neutron-api-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
@ -38,7 +38,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -46,7 +46,7 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -54,7 +54,7 @@ applications:
- '4'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -63,7 +63,7 @@ applications:
- '5'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
# NOTE(ajkavanagh) apparently it has no openstack origin!
#options:

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

@ -21,14 +21,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
designate-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
neutron-api-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
@ -38,7 +38,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -46,7 +46,7 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -54,7 +54,7 @@ applications:
- '4'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -63,7 +63,7 @@ applications:
- '5'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
# NOTE(ajkavanagh) apparently it has no openstack origin!
#options:

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

@ -12,7 +12,7 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
@ -24,19 +24,19 @@ 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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,27 +12,27 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,31 +12,31 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,31 +12,31 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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

@ -12,31 +12,31 @@ machines:
applications:
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '6'
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'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '2'
designate-bind:
charm: cs:~openstack-charmers-next/designate-bind
charm: cs:~openstack-charmers/designate-bind
num_units: 1
to:
- '3'

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