openstack
/
charm-heat
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: Ide929929d9c7325a5af7fcd20040dfb696efe4a6
This commit is contained in:
Liam Young 2020-02-17 15:45:04 +00:00
parent 4984fd9032
commit a3f8dfa542
11 changed files with 78 additions and 76 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-heat.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

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

@ -20,7 +20,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -30,28 +30,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -60,7 +60,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,19 +69,19 @@ applications:
to:
- '5'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
heat:
charm: ../../../heat
num_units: 2

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

@ -20,7 +20,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -30,28 +30,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -60,7 +60,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,19 +69,19 @@ applications:
to:
- '5'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
heat:
charm: ../../../heat
num_units: 2

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

@ -20,7 +20,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -30,28 +30,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -60,7 +60,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,19 +69,19 @@ applications:
to:
- '5'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
heat:
charm: ../../../heat
num_units: 2

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

@ -21,7 +21,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -31,28 +31,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -61,7 +61,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -70,7 +70,7 @@ applications:
to:
- '5'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:placement
num_units: 1
constraints: mem=1G
options:
@ -79,19 +79,19 @@ applications:
to:
- '6'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
heat:
charm: ../../../heat
num_units: 2

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

@ -28,28 +28,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -57,7 +57,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -19,7 +19,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -29,28 +29,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -58,7 +58,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -20,7 +20,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -30,28 +30,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -60,7 +60,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,19 +69,19 @@ applications:
to:
- '5'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
heat:
charm: ../../../heat
num_units: 2

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

@ -20,7 +20,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -30,28 +30,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -60,7 +60,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,19 +69,19 @@ applications:
to:
- '5'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
heat:
charm: ../../../heat
num_units: 2

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

@ -20,7 +20,7 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
options:
innodb-buffer-pool-size: 256M
@ -30,28 +30,28 @@ applications:
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '1'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '2'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -60,7 +60,7 @@ applications:
to:
- '4'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,19 +69,19 @@ applications:
to:
- '5'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
heat:
charm: ../../../heat
num_units: 2