From cce20db298566a9b1e518af2a0e37f90ff59b543 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Sun, 1 Oct 2017 05:34:49 -0700 Subject: [PATCH] Fix cinder mn-sub mulitnode jobs These are multinode jobs that don't have multinode in their name so were missed earlier. Update them to include the multinode base job as parent for firewall fixes and run the main playbook only on the primary node. Change-Id: Iba9e4534a3d0eb01ed814c4edf335e634621925e --- playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml | 2 +- playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml | 2 +- .../legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml | 2 +- zuul.d/zuul-legacy-jobs.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml index 2873b2f8..2b12f1eb 100644 --- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run.yaml @@ -1,4 +1,4 @@ -- hosts: all +- hosts: primary name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-bak from old job gate-grenade-dsvm-cinder-mn-sub-bak-ubuntu-xenial-nv tasks: diff --git a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml index 0ca2dee3..37d39fc8 100644 --- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml @@ -1,4 +1,4 @@ -- hosts: all +- hosts: primary name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-volbak from old job gate-grenade-dsvm-cinder-mn-sub-volbak-ubuntu-xenial tasks: diff --git a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml index ad62c8e9..d6017497 100644 --- a/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml +++ b/playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run.yaml @@ -1,4 +1,4 @@ -- hosts: all +- hosts: primary name: Autoconverted job legacy-grenade-dsvm-cinder-mn-sub-volschbak from old job gate-grenade-dsvm-cinder-mn-sub-volschbak-ubuntu-xenial-nv tasks: diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 3c2edc57..942db3d0 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -2728,7 +2728,7 @@ - job: name: legacy-grenade-dsvm-cinder-mn-sub-bak - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/run post-run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-bak/post timeout: 10800 @@ -2740,7 +2740,7 @@ - job: name: legacy-grenade-dsvm-cinder-mn-sub-volbak - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run post-run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/post timeout: 10800 @@ -2752,7 +2752,7 @@ - job: name: legacy-grenade-dsvm-cinder-mn-sub-volschbak - parent: legacy-dsvm-base + parent: legacy-dsvm-base-multinode run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/run post-run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-volschbak/post timeout: 10800