openstack
/
charm-nova-cloud-controller
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: I88b81c6fb50b62778360d163d13971cb3d941297
This commit is contained in:
David Ames 2020-05-21 09:58:29 -07:00
parent d4a79f28dd
commit b837a8ba4d
13 changed files with 98 additions and 96 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-nova-cloud-controller.git
defaultbranch=stable/20.05

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.05
destination: charmhelpers
include:
- core

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

@ -40,10 +40,10 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -61,26 +61,26 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -40,10 +40,10 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -62,32 +62,32 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -40,10 +40,10 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -62,32 +62,32 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-stein
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-stein
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-stein
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -46,10 +46,10 @@ relations:
- nova-cloud-controller:placement
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -68,37 +68,37 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:bionic-train
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-train
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-train
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: cloud:bionic-train
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -46,10 +46,10 @@ relations:
- nova-cloud-controller:placement
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -68,7 +68,7 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
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
@ -77,30 +77,30 @@ applications:
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

28
tests/bundles/focal-ussuri.yaml
View File

@ -29,18 +29,18 @@ machines:
applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
glance-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
placement-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
@ -50,7 +50,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'
@ -69,7 +69,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
@ -81,7 +81,7 @@ applications:
- '5'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -89,7 +89,7 @@ applications:
- '6'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
@ -98,7 +98,7 @@ applications:
- '7'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -106,10 +106,10 @@ applications:
- '8'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
@ -117,7 +117,7 @@ applications:
- '9'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
storage:
ephemeral-device: '40G'

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

@ -40,7 +40,7 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
percona-cluster:
charm: cs:trusty/percona-cluster
@ -60,32 +60,32 @@ applications:
network-manager: Neutron
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -40,10 +40,10 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -59,26 +59,26 @@ applications:
network-manager: Neutron
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -40,10 +40,10 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -62,32 +62,32 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -40,10 +40,10 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -62,32 +62,32 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-pike
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:xenial-pike
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:

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

@ -40,10 +40,10 @@ relations:
- neutron-openvswitch:amqp
applications:
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
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
@ -62,32 +62,32 @@ applications:
vendor-data-url: http://some.url/vdata
debug: true
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: cloud:xenial-queens
flat-network-providers: physnet1
neutron-security-groups: true
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: cloud:xenial-queens
bridge-mappings: physnet1:br-ex
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options: