diff options
| author | Sam Betts <sam@code-smash.net> | 2018-02-07 15:20:24 +0000 |
|---|---|---|
| committer | Sam Betts <sam@code-smash.net> | 2018-02-07 16:26:41 +0000 |
| commit | 3625bda6f8f7b6bdebca81256faf6a25674fe350 (patch) | |
| tree | 95eb8740bde2562492a9015099171c40ccc8434a /playbooks | |
| parent | 4ef2c080900d66699356d50a929d5ec05f73dbb8 (diff) | |
| download | ironic-3625bda6f8f7b6bdebca81256faf6a25674fe350.tar.gz | |
Revert grenade jobs to classic drivers
This reverts the grenade job driver changes from commit
fa850c80cbc701f1252dabcd3f514bca0148f54d. Local config settings in the
grenade jobs are used for the previous version (old) devstack plugin in
the grenade run. So the local config defined here must match how we want
the old devstack setup, not the current (new) devstack.
Change-Id: I3d5aa1da6879a0c624b5196632886da32e12d7d7
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 12 | ||||
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic/run.yaml | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index 1839565db..e408b9253 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -1,3 +1,10 @@ +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# NOTE(sambetts) DO NOT UPDATE this job when you update the other jobs with +# changes related to the current branch. The devstack local config defined in +# this job is run against the last (old) version of the devstack plugin in the +# grenade steps. +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + - hosts: primary name: Autoconverted job legacy-grenade-dsvm-ironic-multinode-multitenant from old job gate-grenade-dsvm-ironic-multinode-multitenant-ubuntu-xenial @@ -147,8 +154,7 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct" + export DEVSTACK_GATE_IRONIC_DRIVER=agent_ipmitool export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE @@ -158,7 +164,7 @@ export DEVSTACK_GATE_TLSPROXY=1 fi - # direct deploy requires Swift temporary URLs + # agent_* drivers require Swift temporary URLs export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=secretkey" diff --git a/playbooks/legacy/grenade-dsvm-ironic/run.yaml b/playbooks/legacy/grenade-dsvm-ironic/run.yaml index d27dd6902..481e3155c 100644 --- a/playbooks/legacy/grenade-dsvm-ironic/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic/run.yaml @@ -1,3 +1,10 @@ +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# NOTE(sambetts) DO NOT UPDATE this job when you update the other jobs with +# changes related to the current branch. The devstack local config defined in +# this job is run against the last (old) version of the devstack plugin in the +# grenade steps. +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + - hosts: all name: Autoconverted job legacy-grenade-dsvm-ironic from old job gate-grenade-dsvm-ironic-ubuntu-xenial-nv tasks: @@ -109,8 +116,7 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_CONFIGDRIVE=1 - export DEVSTACK_GATE_IRONIC_DRIVER=ipmi - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=iscsi" + export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE |