openstack
/
charm-octavia-dashboard
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: I34460a160d8ea19bdb2ecaa2e1b605bc6005eaf8
This commit is contained in:
David Ames 2020-05-21 09:58:56 -07:00
parent db915e8836
commit 8e322ff954
8 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
port=29418
project=openstack/charm-octavia-dashboard.git
defaultbranch=stable/20.05

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

@ -26,33 +26,33 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
neutron-security-groups: True
neutron-openvswitch:
series: bionic
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
octavia:
series: bionic
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
openstack-dashboard:
series: bionic
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
@ -60,5 +60,5 @@ applications:
series: bionic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1

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

@ -26,33 +26,33 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-stein
neutron-security-groups: True
neutron-openvswitch:
series: bionic
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
octavia:
series: bionic
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-stein
openstack-dashboard:
series: bionic
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-stein
@ -60,5 +60,5 @@ applications:
series: bionic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1

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

@ -26,33 +26,33 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-train
neutron-security-groups: True
neutron-openvswitch:
series: bionic
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
octavia:
series: bionic
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-train
openstack-dashboard:
series: bionic
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-train
@ -60,5 +60,5 @@ applications:
series: bionic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1

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

@ -26,16 +26,16 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
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
@ -43,20 +43,20 @@ applications:
openstack-origin: cloud:bionic-ussuri
neutron-security-groups: True
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
octavia-dashboard:
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1

14
src/tests/bundles/eoan-train.yaml
View File

@ -26,33 +26,33 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:eoan-train
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:eoan-train
neutron-security-groups: True
neutron-openvswitch:
series: eoan
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
octavia:
series: eoan
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:eoan-train
openstack-dashboard:
series: eoan
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:eoan-train
@ -60,5 +60,5 @@ applications:
series: eoan
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1

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

@ -21,16 +21,16 @@ machines:
applications:
keystone-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
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
openstack-dashboard-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
@ -40,7 +40,7 @@ applications:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -48,7 +48,7 @@ applications:
- '3'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -56,7 +56,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
@ -67,11 +67,11 @@ applications:
- '5'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
@ -79,7 +79,7 @@ applications:
- '6'
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin

4
src/wheelhouse.txt Normal file
View File

@ -0,0 +1,4 @@
git+https://opendev.org/openstack/charms.openstack.git@stable/20.05#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/20.05#egg=charmhelpers