Properly export nodepool dsvm variables for debian / redhat

This should be the final thing needed to get our jobs to properly
work.

Change-Id: I0e09ac85510be1d03181648d79849696ba20ff7a
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-12-22 22:47:31 -05:00
parent 71d947d315
commit b3c684b2c3

View File

@ -95,22 +95,22 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=diskimage-builder,glean,shade"
if [ "{images}" == "-redhat" ] ; then
NODEPOOL_PAUSE_CENTOS_7_DIB=false
NODEPOOL_PAUSE_FEDORA_24_DIB=false
NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true
export NODEPOOL_PAUSE_CENTOS_7_DIB=false
export NODEPOOL_PAUSE_FEDORA_24_DIB=false
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=$NODEPOOL_PAUSE_FEDORA_24_DIB"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=$NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB"
elif [ "{images}" == "-debian" ] ; then
NODEPOOL_PAUSE_CENTOS_7_DIB=true
NODEPOOL_PAUSE_FEDORA_24_DIB=true
NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false
export NODEPOOL_PAUSE_CENTOS_7_DIB=true
export NODEPOOL_PAUSE_FEDORA_24_DIB=true
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false
export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=$NODEPOOL_PAUSE_FEDORA_24_DIB"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=$NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB"