openstack
/
charm-rabbitmq-server
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: I27b247a468494a98e870396ab3877ce9669e3510
This commit is contained in:
Aurelien Lourot 2020-11-02 11:53:39 +01:00
parent 33af068075
commit 259a7f1847
15 changed files with 48 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
port=29418
project=openstack/charm-rabbitmq-server.git
defaultbranch=stable/20.10

2
charm-helpers-hooks.yaml
View File

@ -1,5 +1,5 @@
destination: charmhelpers
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/20.10
include:
- fetch
- core

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

@ -27,15 +27,15 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
admin-password: openstack

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

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

10
tests/bundles/focal-ussuri.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
cinder-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
@ -56,7 +56,7 @@ applications:
- '5'
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
@ -64,7 +64,7 @@ applications:
- '6'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

10
tests/bundles/focal-victoria.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
cinder-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
@ -56,7 +56,7 @@ applications:
- '5'
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
@ -64,7 +64,7 @@ applications:
- '6'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

10
tests/bundles/groovy-victoria.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
cinder-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
@ -56,7 +56,7 @@ applications:
- '5'
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
@ -64,7 +64,7 @@ applications:
- '6'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

6
tests/bundles/trusty-mitaka.yaml
View File

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster-340
charm: cs:~openstack-charmers/percona-cluster-340
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -27,15 +27,15 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
admin-password: openstack

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

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -30,18 +30,18 @@ applications:
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin