openstack
/
instack-undercloud
Code Issues Proposed changes

Be smarter about default NODE_DIST 

Instead of always defaulting to Fedora, default to whatever the host
distro is.
This commit is contained in:
Ben Nemec 2014-11-12 16:00:10 -06:00
parent 2be94d3d1b
commit 33b553b8a4
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/instack-build-images
View File

@ -15,7 +15,14 @@ source "$INSTACK_ROOT"/instack-undercloud/instack-sourcerc
export TMP_DIR=${TMP_DIR:-/var/tmp}
export NODE_ARCH=${NODE_ARCH:-amd64}
export NODE_DIST=${NODE_DIST:-"fedora"}
# TODO(bnemec): This should use set-os-type from tripleo-incubator, but that's
# currently broken for rhel7.
if $(grep -Eqs 'Red Hat Enterprise Linux Server release 7' /etc/redhat-release); then
DEFAULT_DIST=rhel7
else
DEFAULT_DIST=fedora
fi
export NODE_DIST=${NODE_DIST:-$DEFAULT_DIST}
export DEPLOY_IMAGE_ELEMENT=${DEPLOY_IMAGE_ELEMENT:-deploy-ironic}
export DEPLOY_NAME=${DEPLOY_NAME:-deploy-ramdisk-ironic}
export DISCOVERY_IMAGE_ELEMENT=${DISCOVERY_IMAGE_ELEMENT:-discovery-ironic}

9
scripts/instack-virt-setup
View File

@ -43,7 +43,14 @@ fi
export NODE_COUNT=${NODE_COUNT:-4}
export NODE_CNT=$NODE_COUNT
export NODE_DIST=${NODE_DIST:-"fedora"}
# TODO(bnemec): This should use set-os-type from tripleo-incubator, but that's
# currently broken for rhel7.
if $(grep -Eqs 'Red Hat Enterprise Linux Server release 7' /etc/redhat-release); then
DEFAULT_DIST=rhel7
else
DEFAULT_DIST=fedora
fi
export NODE_DIST=${NODE_DIST:-$DEFAULT_DIST}
export NODE_ARCH=${NODE_ARCH:-x86_64}
export NODE_MEM=${NODE_MEM:-4096}