openstack
/
instack-undercloud
Code Issues Proposed changes

Fixups for rhos-release

This commit is contained in:
James Slagle 2014-12-03 16:12:39 -05:00
parent f94e3032ea
commit d624baab65
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/instack-build-images
View File

@ -39,7 +39,7 @@ if [[ "rhel7 centos7" =~ "$NODE_DIST" ]]; then
if [ "$RHOS" = "1" ]; then
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS rhos-release"
else
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS epel rdo-release"
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS epel rdo-juno rdo-release"
fi
fi
@ -50,7 +50,7 @@ fi
export PACKAGES=${PACKAGES:-"1"}
if [ "$PACKAGES" = "1" ]; then
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install rdo-juno"
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install"
fi
export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\