From 78ddeda78a2a3043eaf529adf43a8f77b11b1325 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 1 Jul 2015 13:32:52 +0200 Subject: [PATCH] Remove RHEL quirks for CentOS images Now that the 'centos' element is used for CentOS images, there's no need for the RHEL registration environment variables: hence, drop REG_METHOD and REG_HALT_UNREGISTER. Change-Id: Icc1165b1f48065861ee5d1d691d5f58fb5141fdc --- diskimage-create/diskimage-create.sh | 30 ++-------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index 5005bdff..22af9487 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -371,10 +371,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then # Read Create_CentOS_cloud_image.rst to know how to create CentOS image in qcow2 format export BASE_IMAGE_FILE="CentOS-6.6-cloud-init-20141118.qcow2" export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com" - # No registration for RHEL-based distros - export REG_METHOD=disable - # Workaround for https://review.openstack.org/#/c/162239/ - export REG_HALT_UNREGISTER=1 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_1:-"1.2.1"} export centos_image_name=${centos_vanilla_hadoop_1_image_name:-"centos_sahara_vanilla_hadoop_1_latest$suffix"} @@ -386,7 +382,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then export centos_image_name=${centos_vanilla_hadoop_2_6_image_name:-"centos_sahara_vanilla_hadoop_2_6_latest$suffix"} disk-image-create $TRACING $centos_elements_sequence -o $centos_image_name fi - unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES REG_METHOD REG_HALT_UNREGISTER + unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES fi fi @@ -452,11 +448,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then export BASE_IMAGE_FILE="CentOS-6.6-cloud-init-20141118.qcow2" export DIB_CLOUD_IMAGES="http://sahara-files.mirantis.com" - # No registration for RHEL-based distros - export REG_METHOD=disable - # Workaround for https://review.openstack.org/#/c/162239/ - export REG_HALT_UNREGISTER=1 - # Ignoring image type option if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then export centos_image_name_hdp_1_3=${centos_hdp_hadoop_1_image_name:-"centos-6_6-64-hdp-1-3"} @@ -493,7 +484,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then export DIB_HDP_VERSION="2.0" disk-image-create $TRACING $centos_elements_sequence -o $centos_image_name_hdp_2_0 fi - unset BASE_IMAGE_FILE DIB_IMAGE_SIZE DIB_CLOUD_IMAGES REG_METHOD REG_HALT_UNREGISTER + unset BASE_IMAGE_FILE DIB_IMAGE_SIZE DIB_CLOUD_IMAGES fi ######################### @@ -550,10 +541,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then fi if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos" ]; then - # No registration for RHEL-based distros - export REG_METHOD=disable - # Workaround for https://review.openstack.org/#/c/162239/ - export REG_HALT_UNREGISTER=1 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "5.0" ]; then # CentOS cloud image: # - Disable including 'base' element for CentOS @@ -611,7 +598,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES DIB_CDH_VERSION fi - unset REG_METHOD REG_HALT_UNREGISTER fi unset DIB_MIN_TMPFS fi @@ -654,10 +640,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "mapr" ]; then if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos" ]; then export BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-"CentOS-6.6-cloud-init-20141118.qcow2"} export DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-"http://sahara-files.mirantis.com"} - # No registration for RHEL-based distros - export REG_METHOD=disable - # Workaround for https://review.openstack.org/#/c/162239/ - export REG_HALT_UNREGISTER=1 mapr_centos_image_name=${mapr_centos_image_name:-centos_6.5_mapr_${DIB_MAPR_VERSION}_latest} @@ -665,8 +647,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "mapr" ]; then unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES unset DIB_CLOUD_INIT_DATASOURCES - unset REG_METHOD - unset REG_HALT_UNREGISTER fi fi @@ -706,17 +686,11 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "plain" ]; then if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos" ]; then export BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-"CentOS-6.6-cloud-init-20141118.qcow2"} export DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-"http://sahara-files.mirantis.com"} - # No registration for RHEL-based distros - export REG_METHOD=disable - # Workaround for https://review.openstack.org/#/c/162239/ - export REG_HALT_UNREGISTER=1 plain_image_name=${plain_centos_image_name:-centos_plain} disk-image-create $TRACING $centos_elements_sequence -o $plain_image_name unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES - unset REG_METHOD - unset REG_HALT_UNREGISTER fi fi