openstack
/
instack-undercloud
Code Issues Proposed changes

Merge branch 'master' of https://github.com/cybertron/instack-undercloud into cybertron-master 

Conflicts:
	scripts/instack-build-images
This commit is contained in:
James Slagle 2014-12-11 15:56:39 -05:00
parent ffb528c169 988f7e8a2b
commit c6a1b87acd
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/instack-build-images
View File

@ -37,7 +37,6 @@ network-gateway \
export RHOS=${RHOS:-"0"}
export RHOS_RELEASE=${RHOS_RELEASE:-"0"}
if [[ "rhel7 centos7" =~ "$NODE_DIST" ]]; then
# Default filesystem type is XFS for RHEL 7
export FS_TYPE=${FS_TYPE:-xfs}

1
scripts/instack-virt-setup
View File

@ -47,6 +47,7 @@ export NODE_CNT=$NODE_COUNT
# currently broken for rhel7.
if $(grep -Eqs 'Red Hat Enterprise Linux Server release 7' /etc/redhat-release); then
DEFAULT_DIST=rhel7
export FS_TYPE=${FS_TYPE:-xfs}
else
DEFAULT_DIST=fedora
fi