openstack/sahara-image-elements
Code Issues Proposed changes

Merge "Add CentOS-6.6 cloud image"

Browse Source
This commit is contained in:
Jenkins 2014-11-20 08:13:53 +00:00 committed by Gerrit Code Review
commit a519718cfa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage-create/diskimage-create.sh
View File

@ -286,7 +286,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
# - Export link and filename for CentOS cloud image to download # - Export link and filename for CentOS cloud image to download
if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos" ]; then if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos" ]; then
# Read Create_CentOS_cloud_image.rst to know how to create CentOS image in qcow2 format # Read Create_CentOS_cloud_image.rst to know how to create CentOS image in qcow2 format
export BASE_IMAGE_FILE="CentOS-6.5-cloud-init-20140930.qcow2" export BASE_IMAGE_FILE="CentOS-6.6-cloud-init-20141118.qcow2"
export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com" export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com"
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then
export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_1:-"1.2.1"} export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_1:-"1.2.1"}
@ -378,7 +378,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then
# CentOS cloud image: # CentOS cloud image:
# - Disable including 'base' element for CentOS # - Disable including 'base' element for CentOS
# - Export link and filename for CentOS cloud image to download # - Export link and filename for CentOS cloud image to download
export BASE_IMAGE_FILE="CentOS-6.5-cloud-init-20140930.qcow2" export BASE_IMAGE_FILE="CentOS-6.6-cloud-init-20141118.qcow2"
export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com" export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com"
# Setup Java Install configuration for the HDP images # Setup Java Install configuration for the HDP images
@ -467,7 +467,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then
# CentOS cloud image: # CentOS cloud image:
# - Disable including 'base' element for CentOS # - Disable including 'base' element for CentOS
# - Export link and filename for CentOS cloud image to download # - Export link and filename for CentOS cloud image to download
export BASE_IMAGE_FILE="CentOS-6.5-cloud-init-20140930.qcow2" export BASE_IMAGE_FILE="CentOS-6.6-cloud-init-20141118.qcow2"
export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com" export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com"
cloudera_centos_image_name=${cloudera_centos_image_name:-centos_sahara_cloudera_latest} cloudera_centos_image_name=${cloudera_centos_image_name:-centos_sahara_cloudera_latest}