openstack
/
octavia
Code Issues Proposed changes

Add experimental amphorav2 jobs 

The following jobs with default amphorav2 added as experimental:
* octavia-v2-dsvm-noop-api
* octavia-v2-dsvm-tls-barbican
* octavia-v2-dsvm-spare-pool
* octavia-v2-act-stdby-dsvm-scenario
* octavia-grenade
* octavia-v2-dsvm-cinder-amphora
* octavia-v2-dsvm-scenario-two-node

Note: octavia-grenade-amphorav2 will show valid result
with renamed alias amphorav2 -> amphora.

Change-Id: I03385d93575db4e44a72335c0af4fde490a93b0f
This commit is contained in:
Ann Taraday 2020-06-25 16:23:47 +04:00
parent 198980639c
commit 9a6a90000f
4 changed files with 157 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -298,6 +298,7 @@ function octavia_configure {
iniset $OCTAVIA_CONF database connection "mysql+pymysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:3306/octavia"
if [[ ${OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD} == True ]]; then
iniset $OCTAVIA_CONF task_flow persistence_connection "mysql+pymysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:3306/octavia_persistence"
iniset $OCTAVIA_CONF task_flow jobboard_expiration_time ${OCTAVIA_JOBBOARD_EXPIRATION_TIME}
fi
# Configure keystone auth_token for all users
configure_keystone_authtoken_middleware $OCTAVIA_CONF octavia

1
devstack/settings
View File

@ -35,6 +35,7 @@ OCTAVIA_HA_PORT=${OCTAVIA_HA_PORT:-"9875"}
OCTAVIA_HM_LISTEN_PORT=${OCTAVIA_HM_LISTEN_PORT:-"5555"}
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD=${OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD:-False}
OCTAVIA_JOBBOARD_EXPIRATION_TIME=${OCTAVIA_JOBBOARD_EXPIRATION_TIME:-30}
OCTAVIA_MGMT_SUBNET=${OCTAVIA_MGMT_SUBNET:-"192.168.0.0/24"}
OCTAVIA_MGMT_SUBNET_START=${OCTAVIA_MGMT_SUBNET_START:-"192.168.0.2"}

148
zuul.d/amphorav2-jobs.yaml Normal file
View File

@ -0,0 +1,148 @@
- job:
name: octavia-v2-dsvm-scenario-amphora-v2
parent: octavia-v2-dsvm-scenario
vars:
devstack_localrc:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
api_settings:
default_provider_driver: amphorav2
enabled_provider_drivers: amphorav2:The v2 amphora driver.
task_flow:
jobboard_expiration_time: 100
test-config:
"$TEMPEST_CONFIG":
load_balancer:
enabled_provider_drivers: amphorav2:The v2 amphora driver.
provider: amphorav2
- job:
name: octavia-v2-dsvm-noop-api-amphora-v2
parent: octavia-v2-dsvm-noop-api
vars:
devstack_localrc:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
api_settings:
default_provider_driver: amphorav2
enabled_provider_drivers: amphorav2:The v2 amphora driver.
task_flow:
jobboard_expiration_time: 100
test-config:
"$TEMPEST_CONFIG":
load_balancer:
enabled_provider_drivers: amphorav2:The v2 amphora driver.
provider: amphorav2
- job:
name: octavia-v2-dsvm-tls-barbican-amphora-v2
parent: octavia-v2-dsvm-tls-barbican
vars:
devstack_localrc:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
api_settings:
default_provider_driver: amphorav2
enabled_provider_drivers: amphorav2:The v2 amphora driver.
task_flow:
jobboard_expiration_time: 100
test-config:
"$TEMPEST_CONFIG":
load_balancer:
enabled_provider_drivers: amphorav2:The v2 amphora driver.
provider: amphorav2
- job:
name: octavia-v2-dsvm-spare-pool-amphora-v2
parent: octavia-v2-dsvm-spare-pool
vars:
devstack_localrc:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
api_settings:
default_provider_driver: amphorav2
enabled_provider_drivers: amphorav2:The v2 amphora driver.
task_flow:
jobboard_expiration_time: 100
test-config:
"$TEMPEST_CONFIG":
load_balancer:
enabled_provider_drivers: amphorav2:The v2 amphora driver.
provider: amphorav2
- job:
name: octavia-v2-act-stdby-dsvm-scenario-amphora-v2
parent: octavia-v2-act-stdby-dsvm-scenario
vars:
devstack_localrc:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
api_settings:
default_provider_driver: amphorav2
enabled_provider_drivers: amphorav2:The v2 amphora driver.
task_flow:
jobboard_expiration_time: 100
test-config:
"$TEMPEST_CONFIG":
load_balancer:
enabled_provider_drivers: amphorav2:The v2 amphora driver.
provider: amphorav2
- job:
name: octavia-grenade-amphora-v2
parent: octavia-grenade
vars:
grenade_devstack_localrc:
new:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
OCTAVIA_JOBBOARD_EXPIRATION_TIME: 100
- job:
name: octavia-v2-dsvm-cinder-amphora-v2
parent: octavia-v2-dsvm-cinder-amphora
vars:
devstack_localrc:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
api_settings:
default_provider_driver: amphorav2
enabled_provider_drivers: amphorav2:The v2 amphora driver.
task_flow:
jobboard_expiration_time: 100
test-config:
"$TEMPEST_CONFIG":
load_balancer:
enabled_provider_drivers: amphorav2:The v2 amphora driver.
provider: amphorav2
- job:
name: octavia-v2-dsvm-scenario-two-node-amphora-v2
parent: octavia-v2-dsvm-scenario-two-node
vars:
devstack_localrc:
OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
api_settings:
default_provider_driver: amphorav2
enabled_provider_drivers: amphorav2:The v2 amphora driver.
task_flow:
jobboard_expiration_time: 100
test-config:
"$TEMPEST_CONFIG":
load_balancer:
enabled_provider_drivers: amphorav2:The v2 amphora driver.
provider: amphorav2

7
zuul.d/projects.yaml
View File

@ -109,3 +109,10 @@
experimental:
jobs:
- octavia-v2-dsvm-scenario-nftables
- octavia-v2-dsvm-noop-api-amphora-v2
- octavia-v2-dsvm-tls-barbican-amphora-v2
- octavia-v2-dsvm-spare-pool-amphora-v2
- octavia-v2-act-stdby-dsvm-scenario-amphora-v2
- octavia-grenade-amphora-v2
- octavia-v2-dsvm-cinder-amphora-v2
- octavia-v2-dsvm-scenario-two-node-amphora-v2