Added tag instance for linux awslaunch

cianfrocco-lab · Aug 8, 2017 · a7a131e · a7a131e
1 parent 3acbdc2
commit a7a131e
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 9 deletions.
diff --git a/aws/launch_AWS_instance.py b/aws/launch_AWS_instance.py
@@ -29,6 +29,8 @@ def setupParserOptions():
 	    help="Optional: Force instance to remain on always (when this option is not specified, instance will be terminated after 30 minutes of idle time)")
     parser.add_option("--instanceList", action="store_true",dest="listInstance",default=False,
             help="Flag to list available instances")
+    parser.add_option("--tag",dest="tagname",type="string",metavar="STRING",default='None',
+            help="Optional: Provide user-specified tag for instance. By default, instance will be tagged with keypair name")
     parser.add_option("-d", action="store_true",dest="debug",default=False,
             help="debug")
     options,args = parser.parse_args()
@@ -263,12 +265,17 @@ def launchInstance(params,keyName,keyPath,AMI,AWS_ACCOUNT_ID):
 	   #Tag instance using keyname (which should be username, region)
             if params['debug'] is True:
         	print '\nTagging instance %s with your key pair name %s\n' %(InstanceID,keyName)
-    	    cmd='aws ec2 create-tags --resources %s --tags Key=Owner,Value=%s' %(InstanceID,keyName)
-    	    subprocess.Popen(cmd,shell=True).wait()
+            if params['tagname'] == 'None': 
+	    	    cmd='aws ec2 create-tags --resources %s --tags Key=Owner,Value=%s' %(InstanceID,keyName)
+    		    subprocess.Popen(cmd,shell=True).wait()
 
-	    pwd=os.getcwd()
-	    cmd='aws ec2 create-tags --resources %s --tags Key=Directory,Value=%s' %(InstanceID,pwd)
-	    subprocess.Popen(cmd,shell=True).wait()
+            if params['tagname'] != 'None': 
+		    cmd='aws ec2 create-tags --resources %s --tags Key=Owner,Value=%s' %(InstanceID,params['tagname'])
+                    subprocess.Popen(cmd,shell=True).wait()
+
+            pwd=os.getcwd()
+            cmd='aws ec2 create-tags --resources %s --tags Key=Directory,Value=%s' %(InstanceID,pwd)
+            subprocess.Popen(cmd,shell=True).wait()
 
 	    if params['cloudskip'] is False: 
 		if params['debug'] is True:
@@ -310,7 +317,7 @@ def launchInstance(params,keyName,keyPath,AMI,AWS_ACCOUNT_ID):
 	    print 'Spot instance request submitted.\n'
 
 #======================
-def AttachMountEBSVol(instanceID,volID,PublicIP,keyPath):
+def AttachMountEBSVol(instanceID,volID,PublicIP,keyPath,params):
 
    fabric_test=module_exists('fabric.api')
    if fabric_test is False:
@@ -325,7 +332,10 @@ def AttachMountEBSVol(instanceID,volID,PublicIP,keyPath):
    #List instances given a users tag
    keyPath=subprocess.Popen('echo $KEYPAIR_PATH',shell=True, stdout=subprocess.PIPE).stdout.read().strip()
 
-   tag=keyPath.split('/')[-1].split('.')[0]
+   if params['tagname'] == 'None':
+	tag=keyPath.split('/')[-1].split('.')[0]
+   if params['tagname'] != 'None': 
+	tag=params['tagname']
 
    print '\n\nAttaching volume %s to instance %s ...\n' %(volID,instanceID)
 
@@ -418,7 +428,7 @@ def query_yes_no(question, default="no"):
     keyName,keyPath,AMI,AWS_ACCOUNT_ID=checkConflicts(params,availInstances)
     instanceID,PublicIP=launchInstance(params,keyName,keyPath,AMI,AWS_ACCOUNT_ID)
     if params['volume'] != 'None': 
-	AttachMountEBSVol(instanceID,params['volume'],PublicIP,keyPath)
+	AttachMountEBSVol(instanceID,params['volume'],PublicIP,keyPath,params)
 
 
 
diff --git a/aws_build_linux/attach_volume.py b/aws_build_linux/attach_volume.py
diff --git a/aws_build_linux/aws_help b/aws_build_linux/aws_help
diff --git a/aws_build_linux/aws_list_projects b/aws_build_linux/aws_list_projects
diff --git a/aws_build_linux/aws_project_delete b/aws_build_linux/aws_project_delete
diff --git a/aws_build_linux/aws_project_initialize b/aws_build_linux/aws_project_initialize
diff --git a/aws_build_linux/aws_project_remove_directory b/aws_build_linux/aws_project_remove_directory
diff --git a/aws_build_linux/aws_project_sync b/aws_build_linux/aws_project_sync
diff --git a/aws_build_linux/create_snapshot.py b/aws_build_linux/create_snapshot.py
diff --git a/aws_build_linux/create_volume.py b/aws_build_linux/create_volume.py
diff --git a/aws_build_linux/create_volume_IOPS.py b/aws_build_linux/create_volume_IOPS.py
diff --git a/aws_build_linux/delete_temp_s3_ebs b/aws_build_linux/delete_temp_s3_ebs
diff --git a/aws_build_linux/detach_volume.py b/aws_build_linux/detach_volume.py
diff --git a/aws_build_linux/kill_instance.py b/aws_build_linux/kill_instance.py
diff --git a/aws_build_linux/kill_snapshot.py b/aws_build_linux/kill_snapshot.py
diff --git a/aws_build_linux/kill_volume.py b/aws_build_linux/kill_volume.py
diff --git a/aws_build_linux/launch_AWS_S3Movie_Alignment.py b/aws_build_linux/launch_AWS_S3Movie_Alignment.py
diff --git a/aws_build_linux/launch_AWS_instance.py b/aws_build_linux/launch_AWS_instance.py
diff --git a/aws_build_linux/launch_starcluster.py b/aws_build_linux/launch_starcluster.py
diff --git a/aws_build_linux/list_all.py b/aws_build_linux/list_all.py
diff --git a/aws_build_linux/list_instances.py b/aws_build_linux/list_instances.py
diff --git a/aws_build_linux/list_spot_price.py b/aws_build_linux/list_spot_price.py
diff --git a/aws_build_linux/qsub_aws b/aws_build_linux/qsub_aws
diff --git a/compile_repo.py b/compile_repo.py
@@ -5,7 +5,7 @@
 import subprocess
 
 notincluded=['aws_init.sh','rclone','rclone_mac','aws_init.sh','s3tmpout.txt']
-outdirname='aws_build_osx' #Choices: aws_build_linux, aws_build_osx
+outdirname='aws_build_linux' #Choices: aws_build_linux, aws_build_osx
 filelist=glob.glob('aws/*')
 
 for f in filelist: