commit 30543ac39be973d32407acfa2153aae924873629 Author: Frode Nordahl Date: Mon Sep 14 10:25:19 2020 +0200 Increase available cores and memory for octavia unit The charm Octavia gate job has started to OOM for the Octavia units as detailed on the bug. This change addresses both that issue and attempts to increase the velocity of the test by adding CPU cores which might help for the time it takes to compile binary dependencies on initial deploy and during the policyd tests. Note that instead of explicitly mentioning amount of memory we assume a flavor with more cores to also have more memory. Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/418 Change-Id: I0f332c5f6d97ed99f59c9985ff4a033920708bf2 Closes-Bug: #1895319 (cherry picked from commit 6e5f83571ca6b63af734990c978a2284fb70e8a4) diff --git a/src/tests/bundles/bionic-rocky-ha.yaml b/src/tests/bundles/bionic-rocky-ha.yaml index de0b2a7..0fc737b 100644 --- a/src/tests/bundles/bionic-rocky-ha.yaml +++ b/src/tests/bundles/bionic-rocky-ha.yaml @@ -136,6 +136,7 @@ applications: charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: + constraints: cores=8 series: bionic charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/bionic-rocky-lxd.yaml b/src/tests/bundles/bionic-rocky-lxd.yaml index 258d372..18fd1a2 100644 --- a/src/tests/bundles/bionic-rocky-lxd.yaml +++ b/src/tests/bundles/bionic-rocky-lxd.yaml @@ -153,6 +153,7 @@ applications: to: - 2 octavia: + constraints: cores=8 series: bionic charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/bionic-stein-ha.yaml b/src/tests/bundles/bionic-stein-ha.yaml index 5349b17..82e5b35 100644 --- a/src/tests/bundles/bionic-stein-ha.yaml +++ b/src/tests/bundles/bionic-stein-ha.yaml @@ -136,6 +136,7 @@ applications: charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: + constraints: cores=8 series: bionic charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/bionic-train-ha-ovn.yaml b/src/tests/bundles/bionic-train-ha-ovn.yaml index 5f2c285..fb89fc1 100644 --- a/src/tests/bundles/bionic-train-ha-ovn.yaml +++ b/src/tests/bundles/bionic-train-ha-ovn.yaml @@ -127,6 +127,7 @@ applications: series: bionic charm: cs:~openstack-charmers/hacluster octavia: + constraints: cores=8 series: bionic charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/bionic-train-ha.yaml b/src/tests/bundles/bionic-train-ha.yaml index 47cfe10..b4720eb 100644 --- a/src/tests/bundles/bionic-train-ha.yaml +++ b/src/tests/bundles/bionic-train-ha.yaml @@ -141,6 +141,7 @@ applications: charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: + constraints: cores=8 series: bionic charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml b/src/tests/bundles/bionic-ussuri-ha-ovn.yaml index 630354e..54b8e55 100644 --- a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml +++ b/src/tests/bundles/bionic-ussuri-ha-ovn.yaml @@ -129,6 +129,7 @@ applications: series: bionic charm: cs:~openstack-charmers/hacluster octavia: + constraints: cores=8 series: bionic charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/bionic-ussuri-ha.yaml b/src/tests/bundles/bionic-ussuri-ha.yaml index 3531a79..2b23182 100644 --- a/src/tests/bundles/bionic-ussuri-ha.yaml +++ b/src/tests/bundles/bionic-ussuri-ha.yaml @@ -142,6 +142,7 @@ applications: charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: + constraints: cores=8 series: bionic charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/focal-ussuri-ha-ovn.yaml b/src/tests/bundles/focal-ussuri-ha-ovn.yaml index 9de73a3..ff358b7 100644 --- a/src/tests/bundles/focal-ussuri-ha-ovn.yaml +++ b/src/tests/bundles/focal-ussuri-ha-ovn.yaml @@ -124,9 +124,6 @@ applications: charm: cs:~openstack-charmers/neutron-api num_units: 1 options: - # NOTE(fnordahl): At current state of upstream Neutron development this - # is a requirement. Remove once fixed upstream. - enable-ml2-port-security: true openstack-origin: distro debug: True flat-network-providers: physnet1 @@ -150,6 +147,7 @@ applications: series: focal charm: cs:~openstack-charmers/hacluster octavia: + constraints: cores=8 series: focal charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/focal-ussuri-ha.yaml b/src/tests/bundles/focal-ussuri-ha.yaml index 84fab9b..2027b85 100644 --- a/src/tests/bundles/focal-ussuri-ha.yaml +++ b/src/tests/bundles/focal-ussuri-ha.yaml @@ -163,6 +163,7 @@ applications: charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: + constraints: cores=8 series: focal charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/focal-victoria-ha-ovn.yaml b/src/tests/bundles/focal-victoria-ha-ovn.yaml index 88992f8..6908738 100644 --- a/src/tests/bundles/focal-victoria-ha-ovn.yaml +++ b/src/tests/bundles/focal-victoria-ha-ovn.yaml @@ -124,9 +124,6 @@ applications: charm: cs:~openstack-charmers/neutron-api num_units: 1 options: - # NOTE(fnordahl): At current state of upstream Neutron development this - # is a requirement. Remove once fixed upstream. - enable-ml2-port-security: true openstack-origin: cloud:focal-victoria debug: True flat-network-providers: physnet1 @@ -150,6 +147,7 @@ applications: series: focal charm: cs:~openstack-charmers/hacluster octavia: + constraints: cores=8 series: focal charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/focal-victoria-ha.yaml b/src/tests/bundles/focal-victoria-ha.yaml index 691fd5f..cf0118f 100644 --- a/src/tests/bundles/focal-victoria-ha.yaml +++ b/src/tests/bundles/focal-victoria-ha.yaml @@ -163,6 +163,7 @@ applications: charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: + constraints: cores=8 series: focal charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/groovy-victoria-ha-ovn.yaml b/src/tests/bundles/groovy-victoria-ha-ovn.yaml index 542cbe3..bc92a47 100644 --- a/src/tests/bundles/groovy-victoria-ha-ovn.yaml +++ b/src/tests/bundles/groovy-victoria-ha-ovn.yaml @@ -124,9 +124,6 @@ applications: charm: cs:~openstack-charmers/neutron-api num_units: 1 options: - # NOTE(fnordahl): At current state of upstream Neutron development this - # is a requirement. Remove once fixed upstream. - enable-ml2-port-security: true openstack-origin: distro debug: True flat-network-providers: physnet1 @@ -150,6 +147,7 @@ applications: series: groovy charm: cs:~openstack-charmers/hacluster octavia: + constraints: cores=8 series: groovy charm: ../../../octavia num_units: 3 diff --git a/src/tests/bundles/groovy-victoria-ha.yaml b/src/tests/bundles/groovy-victoria-ha.yaml index 983a5d6..396f3f1 100644 --- a/src/tests/bundles/groovy-victoria-ha.yaml +++ b/src/tests/bundles/groovy-victoria-ha.yaml @@ -163,6 +163,7 @@ applications: charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: + constraints: cores=8 series: groovy charm: ../../../octavia num_units: 3