openstack
/
charm-octavia
Code Issues Proposed changes

Add spares and topology to functional test bundles 

Re-order configure steps for functional test.

When adding spares Octavia would end up spinning up a lot of
loadbalancer instances.  This is a side effect of retrying spare
pool creation while awaiting availability of the Amphora image.
This in turn would lead to overloading the hypervisor in the test
model.

Bump memory resource allocation to ``nova-compute`` node in test
bundle to allow for spare instances and using two instances per
active loadbalancer.

Change-Id: I7cd74db5919d63e917dc343ede899ddc0c245285
Related-Bug: #1826875
This commit is contained in:
Frode Nordahl 2019-04-29 15:38:45 -06:00
parent 84cd212777
commit e622cf0e6e
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
9 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tests/bundles/bionic-rocky-ha.yaml
View File

@ -107,9 +107,9 @@ applications:
debug: True
network-manager: Neutron
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
openstack-origin: cloud:bionic-rocky
debug: True
@ -123,6 +123,8 @@ applications:
options:
debug: True
openstack-origin: cloud:bionic-rocky
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
vip: 'ADD YOUR VIP HERE'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server

8
src/tests/bundles/bionic-rocky-lxd.yaml
View File

@ -130,9 +130,9 @@ applications:
to:
- lxd:1
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
openstack-origin: cloud:bionic-rocky
debug: True
@ -143,8 +143,10 @@ applications:
charm: ../../../octavia
num_units: 3
options:
openstack-origin: cloud:bionic-rocky
debug: True
openstack-origin: cloud:bionic-rocky
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
to:
- lxd:0
- lxd:1

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

@ -105,9 +105,9 @@ applications:
debug: True
network-manager: Neutron
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
openstack-origin: cloud:bionic-rocky
debug: True
@ -118,6 +118,8 @@ applications:
options:
debug: True
openstack-origin: cloud:bionic-rocky
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1

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

@ -105,9 +105,9 @@ applications:
debug: True
network-manager: Neutron
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
openstack-origin: cloud:bionic-stein
debug: True
@ -118,6 +118,8 @@ applications:
options:
debug: True
openstack-origin: cloud:bionic-stein
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1

6
src/tests/bundles/cosmic-rocky-ha.yaml
View File

@ -100,9 +100,9 @@ applications:
debug: True
network-manager: Neutron
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
debug: True
hacluster-octavia:
@ -114,6 +114,8 @@ applications:
num_units: 3
options:
debug: True
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
vip: 'ADD YOUR VIP HERE'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server

6
src/tests/bundles/cosmic-rocky-lxd.yaml
View File

@ -123,9 +123,9 @@ applications:
to:
- lxd:1
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
debug: True
to:
@ -136,6 +136,8 @@ applications:
num_units: 3
options:
debug: True
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
to:
- lxd:0
- lxd:1

6
src/tests/bundles/cosmic-rocky.yaml
View File

@ -98,9 +98,9 @@ applications:
debug: True
network-manager: Neutron
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
debug: True
octavia:
@ -109,6 +109,8 @@ applications:
num_units: 3
options:
debug: True
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1

6
src/tests/bundles/disco-stein.yaml
View File

@ -98,9 +98,9 @@ applications:
debug: True
network-manager: Neutron
nova-compute:
constraints: mem=7168M
constraints: mem=10240M
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
num_units: 2
options:
debug: True
octavia:
@ -109,6 +109,8 @@ applications:
num_units: 3
options:
debug: True
spare-pool-size: 2
loadbalancer-topology: 'ACTIVE_STANDBY'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1

2
src/tests/tests.yaml
View File

@ -25,9 +25,9 @@ target_deploy_status:
workload-status: active
workload-status-message: Sync completed
configure:
- zaza.openstack.charm_tests.octavia.setup.configure_octavia
- zaza.openstack.charm_tests.glance.setup.add_lts_image
- zaza.openstack.charm_tests.octavia.diskimage_retrofit.setup.retrofit_amphora_image
- zaza.openstack.charm_tests.octavia.setup.configure_octavia
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network