openstack
/
instack-undercloud
Code Issues Proposed changes

Split $RHOS logic into a $RHOS and $RHOS_RELEASE. Will allow us to disable use 

of epel/rdo, and make rhos-release optional.
This commit is contained in:
James Slagle 2014-12-04 15:15:16 -05:00
parent d624baab65
commit b8bbeddbd9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/instack-build-images
View File

@ -35,12 +35,13 @@ network-gateway \
"
export RHOS=${RHOS:-"0"}
export RHOS_RELEASE=${RHOS_RELEASE:-"0"}
if [[ "rhel7 centos7" =~ "$NODE_DIST" ]]; then
if [ "$RHOS" = "1" ]; then
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS rhos-release"
else
if [ "$RHOS" = "0" ]; then
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS epel rdo-juno rdo-release"
fi
elif [ ! "$RHOS_RELEASE" = "0" ]; then
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS rhos-release"
fi
fi
export DELOREAN=${DELOREAN:-"0"}