Merge "Rename iptables-based active-standby jobs"

This commit is contained in:
Zuul 2019-07-17 07:22:29 +00:00 committed by Gerrit Code Review
commit de01509867
2 changed files with 17 additions and 17 deletions

View File

@ -444,7 +444,7 @@
parent: octavia-v2-dsvm-py2-scenario-centos-7 parent: octavia-v2-dsvm-py2-scenario-centos-7
- job: - job:
name: octavia-v2-act-stdby-dsvm-scenario name: octavia-v2-act-stdby-iptables-dsvm-scenario
parent: octavia-dsvm-live-base parent: octavia-dsvm-live-base
pre-run: playbooks/act_stby_iptables/pre.yaml pre-run: playbooks/act_stby_iptables/pre.yaml
vars: vars:
@ -469,15 +469,15 @@
tox_envlist: all tox_envlist: all
- job: - job:
name: octavia-v2-act-stdby-dsvm-py2-scenario name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
parent: octavia-v2-act-stdby-dsvm-scenario parent: octavia-v2-act-stdby-iptables-dsvm-scenario
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
- job: - job:
name: octavia-v2-act-stdby-dsvm-py2-scenario-centos-7 name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-centos-7
parent: octavia-v2-act-stdby-dsvm-py2-scenario parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
nodeset: devstack-single-node-centos-7 nodeset: devstack-single-node-centos-7
vars: vars:
devstack_localrc: devstack_localrc:
@ -492,16 +492,16 @@
amphora_ssh_user: centos amphora_ssh_user: centos
- job: - job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-stein name: octavia-v2-act-stdby-iptables-dsvm-scenario-stable-stein
parent: octavia-v2-act-stdby-dsvm-scenario parent: octavia-v2-act-stdby-iptables-dsvm-scenario
override-checkout: stable/stein override-checkout: stable/stein
- job: - job:
name: octavia-v2-act-stdby-dsvm-py2-scenario-stable-rocky name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky
parent: octavia-v2-act-stdby-dsvm-py2-scenario parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
override-checkout: stable/rocky override-checkout: stable/rocky
- job: - job:
name: octavia-v2-act-stdby-dsvm-py2-scenario-stable-queens name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens
parent: octavia-v2-act-stdby-dsvm-py2-scenario parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
override-checkout: stable/queens override-checkout: stable/queens

View File

@ -26,17 +26,17 @@
voting: false voting: false
- octavia-v2-dsvm-py2-scenario-two-node: - octavia-v2-dsvm-py2-scenario-two-node:
voting: false voting: false
- octavia-v2-act-stdby-dsvm-scenario: - octavia-v2-act-stdby-iptables-dsvm-scenario:
voting: false voting: false
- octavia-v2-act-stdby-dsvm-py2-scenario: - octavia-v2-act-stdby-iptables-dsvm-py2-scenario:
voting: false voting: false
- octavia-v2-act-stdby-dsvm-py2-scenario-centos-7: - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-centos-7:
voting: false voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-stein: - octavia-v2-act-stdby-iptables-dsvm-scenario-stable-stein:
voting: false voting: false
- octavia-v2-act-stdby-dsvm-py2-scenario-stable-rocky: - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky:
voting: false voting: false
- octavia-v2-act-stdby-dsvm-py2-scenario-stable-queens: - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens:
voting: false voting: false
- octavia-v2-dsvm-tls-barbican: - octavia-v2-dsvm-tls-barbican:
voting: false voting: false