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

View File

@ -2,3 +2,5 @@
host=review.opendev.org host=review.opendev.org
port=29418 port=29418
project=openstack/charm-neutron-openvswitch.git project=openstack/charm-neutron-openvswitch.git
defaultbranch=stable/20.02

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 destination: hooks/charmhelpers
include: include:
- core - core

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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