Updated tag instances to put addtl tag as Name

cianfrocco-lab · Aug 9, 2017 · 8f9d77d · 8f9d77d
1 parent f0fc57a
commit 8f9d77d
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 2 deletions.
diff --git a/aws/launch_AWS_instance.py b/aws/launch_AWS_instance.py
@@ -270,7 +270,10 @@ def launchInstance(params,keyName,keyPath,AMI,AWS_ACCOUNT_ID):
     		    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'])
+		    cmd='aws ec2 create-tags --resources %s --tags Key=Owner,Value=%s' %(InstanceID,keyName)
+                    subprocess.Popen(cmd,shell=True).wait()
+
+		    cmd='aws ec2 create-tags --resources %s --tags Key=Name,Value=%s' %(InstanceID,params['tagname'])
                     subprocess.Popen(cmd,shell=True).wait()
 
             pwd=os.getcwd()

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: