openstack
/
instack-undercloud
Code Issues Proposed changes

Merge pull request #79 from rwsu/pick-rhel-json 

Choose the correct json file depending on your OS
This commit is contained in:
Ben Nemec 2014-11-13 13:12:49 -06:00
parent 43e991f0d5 6f4db73035
commit dabdb735cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/instack-install-undercloud
View File

@ -10,7 +10,11 @@ exec 2>&1
echo "Running $0"
export JSONFILE=${JSONFILE:-/usr/share/instack-undercloud/json-files/fedora-20-undercloud-packages.json}
if [ "$(grep "Fedora" /etc/redhat-release)" == "" ]; then
export JSONFILE=${JSONFILE:-/usr/share/instack-undercloud/json-files/rhel-7-undercloud-packages.json}
else
export JSONFILE=${JSONFILE:-/usr/share/instack-undercloud/json-files/fedora-20-undercloud-packages.json}
fi
export ELEMENTS_PATH=${ELEMENTS_PATH:-"\
/usr/share/tripleo-image-elements:\