summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Egorenko <degorenko@mirantis.com>2014-06-25 17:11:36 +0400
committerDenis Egorenko <degorenko@mirantis.com>2014-06-26 12:34:10 +0400
commita8a8d21cc18da6fcc092a084353df6ea7fcfb5ba (patch)
tree57ba4630d6a6e67f80c02830c6edf522079a19ee
parent2762fb4c198f7410b777feeb93b44a10d620dc08 (diff)
Add 'disable-selinux' element for HDP plugin2014.1.32014.1.2
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Sergey Lukjanov <slukjanov@mirantis.com> Workflow+1: Sergey Lukjanov <slukjanov@mirantis.com> Code-Review+2: Alexander Ignatov <aignatov@mirantis.com> Code-Review+1: Sergey Kolekonov <skolekonov@mirantis.com> Code-Review+1: Ivan Berezovskiy <iberezovskiy@mirantis.com> Code-Review+2: Andrew Lazarev <alazarev@mirantis.com> Code-Review+1: Robert Nettleton <rnettleton@hortonworks.com> Submitted-by: Jenkins Submitted-at: Mon, 30 Jun 2014 16:45:32 +0000 Reviewed-on: https://review.openstack.org/102523 Project: openstack/sahara-image-elements Branch: refs/heads/stable/icehouse
-rwxr-xr-xdiskimage-create/diskimage-create.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 99917cb..c53d2ab 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -298,7 +298,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then
298 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then 298 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then
299 export centos_image_name_hdp_1_3=${centos_hdp_hadoop_1_image_name:-"centos-6_4-64-hdp-1-3"} 299 export centos_image_name_hdp_1_3=${centos_hdp_hadoop_1_image_name:-"centos-6_4-64-hdp-1-3"}
300 # Elements to include in an HDP-based image 300 # Elements to include in an HDP-based image
301 centos_elements_sequence="vm rhel hadoop-hdp disable-firewall redhat-lsb sahara-version source-repositories yum" 301 centos_elements_sequence="vm rhel hadoop-hdp disable-firewall redhat-lsb sahara-version source-repositories yum disable-selinux"
302 if [ "$IMAGE_GENERATION_DEBUG_MODE" = "true" ]; then 302 if [ "$IMAGE_GENERATION_DEBUG_MODE" = "true" ]; then
303 # enable the root-pwd element, for simpler local debugging of images 303 # enable the root-pwd element, for simpler local debugging of images
304 centos_elements_sequence=$centos_elements_sequence" root-passwd" 304 centos_elements_sequence=$centos_elements_sequence" root-passwd"
@@ -313,7 +313,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then
313 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2" ]; then 313 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2" ]; then
314 export centos_image_name_hdp_2_0=${centos_hdp_hadoop_2_image_name:-"centos-6_4-64-hdp-2-0"} 314 export centos_image_name_hdp_2_0=${centos_hdp_hadoop_2_image_name:-"centos-6_4-64-hdp-2-0"}
315 # Elements to include in an HDP-based image 315 # Elements to include in an HDP-based image
316 centos_elements_sequence="vm rhel hadoop-hdp disable-firewall redhat-lsb sahara-version source-repositories yum" 316 centos_elements_sequence="vm rhel hadoop-hdp disable-firewall redhat-lsb sahara-version source-repositories yum disable-selinux"
317 if [ "$IMAGE_GENERATION_DEBUG_MODE" = "true" ]; then 317 if [ "$IMAGE_GENERATION_DEBUG_MODE" = "true" ]; then
318 # enable the root-pwd element, for simpler local debugging of images 318 # enable the root-pwd element, for simpler local debugging of images
319 centos_elements_sequence=$centos_elements_sequence" root-passwd" 319 centos_elements_sequence=$centos_elements_sequence" root-passwd"
@@ -328,7 +328,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then
328 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "plain" ]; then 328 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "plain" ]; then
329 export centos_image_name_plain=${centos_hdp_plain_image_name:-"centos-6_4-64-plain"} 329 export centos_image_name_plain=${centos_hdp_plain_image_name:-"centos-6_4-64-plain"}
330 # Elements for a plain CentOS image that does not contain HDP or Apache Hadoop 330 # Elements for a plain CentOS image that does not contain HDP or Apache Hadoop
331 centos_plain_elements_sequence="vm rhel redhat-lsb sahara-version yum" 331 centos_plain_elements_sequence="vm rhel redhat-lsb sahara-version yum disable-selinux"
332 if [ "$IMAGE_GENERATION_DEBUG_MODE" = "true" ]; then 332 if [ "$IMAGE_GENERATION_DEBUG_MODE" = "true" ]; then
333 # enable the root-pwd element, for simpler local debugging of images 333 # enable the root-pwd element, for simpler local debugging of images
334 centos_elements_sequence=$centos_elements_sequence" root-passwd" 334 centos_elements_sequence=$centos_elements_sequence" root-passwd"