Removing install_type option

Author: Dougal Ballantyne

bootstrap/src/scripts/openlava/boot_as_compute

@@ -65,21 +65,13 @@ if [ $RC -ne 0 ]; then
 fi
 }
 
-function minimal_install () {
+function do_install () {
   configure_openlava
   start_openlava
 }
 
 ## Main script
-case $cfn_install_type in
-  minimal)
-    minimal_install
-    ;;
-
-  *)
-    error_exit "Unkown install type: $cfn_install_type"
-
-esac
+do_install
 
 
 script=`basename $0`

bootstrap/src/scripts/openlava/boot_as_master

@@ -67,22 +67,14 @@ if [ $RC -ne 0 ]; then
 fi
 }
 
-function minimal_install () {
+function do_install () {
   setup_master_openlava
   start_openlava
   add_custom_metric
 }
 
 ## Main script
-case $cfn_install_type in
-  minimal)
-    minimal_install
-    ;;
-
-  *)
-    error_exit "Unkown install type: $cfn_install_type"
-
-esac
+do_install
 
 script=`basename $0`
 echo "cfncluster: $script - SUCCESS - Booted as cfncluster Master"

bootstrap/src/scripts/sge/boot_as_compute

@@ -52,21 +52,13 @@ if [ $RC -ne 0 ]; then
 fi
 }
 
-function minimal_install () {
+function do_install () {
   mount_nfs
   setup_sge_profile
 }
 
 ## Main script
-case $cfn_install_type in
-  minimal)
-    minimal_install
-    ;;
-
-  *)
-    error_exit "Unkown install type: $cfn_install_type"
-
-esac
+do_install
 
 
 script=`basename $0`

bootstrap/src/scripts/sge/boot_as_master

@@ -71,23 +71,15 @@ if [ $RC -ne 0 ]; then
 fi
 }
 
-function minimal_install () {
+function do_install () {
   setup_master_sge
   start_sge
   add_master_submit
   add_custom_metric
 }
 
 ## Main script
-case $cfn_install_type in
-  minimal)
-    minimal_install
-    ;;
-
-  *)
-    error_exit "Unkown install type: $cfn_install_type"
-
-esac
+do_install
 
 script=`basename $0`
 echo "cfncluster: $script - SUCCESS - Booted as cfncluster Master"

bootstrap/src/scripts/torque/boot_as_compute

@@ -53,20 +53,12 @@ if [ $RC -ne 0 ]; then
 fi
 }
 
-function minimal_install () {
+function do_install () {
   setup_torque
 }
 
 ## Main script
-case $cfn_install_type in
-  minimal)
-    minimal_install
-    ;;
-
-  *)
-    error_exit "Unkown install type: $cfn_install_type"
-
-esac
+do_install
 
 
 script=`basename $0`

bootstrap/src/scripts/torque/boot_as_master

@@ -62,21 +62,13 @@ if [ $RC -ne 0 ]; then
 fi
 }
 
-function minimal_install () {
+function do_install () {
   setup_master_torque
   add_custom_metric
 }
 
 ## Main script
-case $cfn_install_type in
-  minimal)
-    minimal_install
-    ;;
-
-  *)
-    error_exit "Unkown install type: $cfn_install_type"
-
-esac
+do_install
 
 script=`basename $0`
 echo "cfncluster: $script - SUCCESS - Booted as cfncluster Master"

cli/cfncluster/cfnconfig.py

@@ -132,7 +132,7 @@ def __init__(self, args):
         self.__cluster_options = dict(cluster_user='ClusterUser', compute_instance_type='ComputeInstanceType',
                                       master_instance_type='MasterInstanceType', initial_queue_size='InitialQueueSize',
                                       max_queue_size='MaxQueueSize', maintain_initial_size='MaintainInitialSize',
-                                      install_type='InstallType', scheduler='Scheduler', cluster_type='ClusterType',
+                                      scheduler='Scheduler', cluster_type='ClusterType',
                                       spot_price='SpotPrice', custom_ami='CustomAMI', pre_install='PreInstallScript',
                                       post_install='PostInstallScript', proxy_server='ProxyServer',
                                       iam_policy='IAMPolicy', placement='Placement', placement_group='PlacementGroup',

cli/cfncluster/examples/config

@@ -42,10 +42,6 @@ key_name = mykey
 # Boolean flag to set autoscaling group to maintain initial size and scale back
 # (defaults to false for the default template)
 #maintain_initial_size = false
-# Type of install on instances. "minimal" is just scheduler and 
-# basic condfig, "full" is VNC + Ganglia as well.
-# (defaults to minimal for the default template)
-#install_type = minimal
 # Cluster scheduler
 # (defaults to sge for the default template)
 #scheduler = sge

cli/setup.py

@@ -20,7 +20,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 console_scripts = ['cfncluster = cfncluster.cli:main']
-version = "0.0.7"
+version = "0.0.8"
 
 setup(
     name = "cfncluster",

cloudformation/cfncluster.cfn.json

@@ -186,16 +186,6 @@
       "Type" : "String",
       "Default" : "NONE"
     },
-    "InstallType" : {
-      "Description" : "Type of install on instances. \"minimal\" is just scheduler and basic condfig, \"full\" is VNC + Ganglia as well.",
-      "Type" : "String",
-      "Default" : "minimal",
-      "ConstraintDescription" : "must be a supported install type",
-      "AllowedValues" : [
-        "minimal",
-        "full"
-      ]
-    },
     "CustomAMI" : {
       "Description" : "ID of a Custom AMI, to use instead of published AMI's",
       "Type" : "String",
@@ -1035,12 +1025,7 @@
                         "Ref" : "EncryptedEphemeral"
                       },
                       "\n",
-                      "cfn_node_type=MasterServer\n",
-                      "cfn_install_type=",
-                      {
-                        "Ref" : "InstallType"
-                      },
-                      "\n"
+                      "cfn_node_type=MasterServer\n"
                     ]
                   ]
                 },
@@ -1383,11 +1368,6 @@
                       {
                         "Ref" : "EncryptedEphemeral"
                       },
-                      "\n",
-                      "cfn_install_type=",
-                      {
-                        "Ref" : "InstallType"
-                      },
                       "\n"
                     ]
                   ]