openstack
/
charm-neutron-openvswitch
Code Issues Proposed changes

Updates for stable branch creation 

Set default branch for git review/gerrit.

Switch amulet tests to stable.

Switch zaza bundles to stable charms.

Switch to using stable charm-helpers branch.

Change-Id: I9fb074f5d13b071933091c8e100526eafa887195
This commit is contained in:
Liam Young 2020-02-17 15:54:15 +00:00
parent 23c546d4b9
commit 84c58d5996
11 changed files with 65 additions and 63 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-neutron-openvswitch.git
defaultbranch=stable/20.02

2
charm-helpers-hooks.yaml
View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/20.02
destination: hooks/charmhelpers
include:
- core

14
tests/bundles/bionic_queens.yaml
View File

@ -12,40 +12,40 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'

14
tests/bundles/bionic_rocky.yaml
View File

@ -12,14 +12,14 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -27,34 +27,34 @@ applications:
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'

14
tests/bundles/bionic_stein.yaml
View File

@ -12,14 +12,14 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -27,34 +27,34 @@ applications:
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'

14
tests/bundles/bionic_train.yaml
View File

@ -13,14 +13,14 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -28,34 +28,34 @@ applications:
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'

12
tests/bundles/trusty_mitaka.yaml
View File

@ -12,14 +12,14 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -27,27 +27,27 @@ applications:
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka

14
tests/bundles/xenial_mitaka.yaml
View File

@ -12,40 +12,40 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'

14
tests/bundles/xenial_ocata.yaml
View File

@ -12,14 +12,14 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -27,34 +27,34 @@ applications:
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'

14
tests/bundles/xenial_pike.yaml
View File

@ -12,14 +12,14 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -27,34 +27,34 @@ applications:
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'

14
tests/bundles/xenial_queens.yaml
View File

@ -12,14 +12,14 @@ machines:
applications:
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
@ -27,34 +27,34 @@ applications:
to:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
to:
- '3'
keystone:
num_units: 1
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '4'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '6'
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
to:
- '0'