Updated launch with SG issue patch

cianfrocco-lab · Aug 3, 2017 · d89fd2c · d89fd2c
1 parent 1539af9
commit d89fd2c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/aws/create_volume.py b/aws/create_volume.py
@@ -11,14 +11,14 @@
 if len(sys.argv) == 4: 
 	volSize=sys.argv[1]
 	AZ=sys.argv[2]
-	allowedZones=['us-east-1b','us-east-1c','us-east-1d','us-east-1e','us-west-2a','us-west-2b','us-west-2c','us-east-2a','us-east-2b','us-east-2c']
+	allowedZones=['us-east-1b','us-east-1c','us-east-1d','us-east-1e','us-west-2a','us-west-2b','us-west-2c','eu-west-1a','eu-west-1b','eu-west-1c','us-east-2a','us-east-2b','us-east-2c']
 	description=sys.argv[3]
 	snapid=''
 
 if len(sys.argv) == 5:
         volSize=sys.argv[1]
         AZ=sys.argv[2]
-        allowedZones=['us-east-1b','us-east-1c','us-east-1d','us-east-1e','us-west-2a','us-west-2b','us-west-2c','us-east-2a','us-east-2b','us-east-2c']
+        allowedZones=['us-east-1b','us-east-1c','us-east-1d','us-east-1e','us-west-2a','us-west-2b','us-west-2c','eu-west-1a','eu-west-1b','eu-west-1c','us-east-2a','us-east-2b','us-east-2c']
         description=sys.argv[3]
 	snapid=' --snapshot-id %s' %(sys.argv[4])
 

diff --git a/aws/launch_AWS_instance.py b/aws/launch_AWS_instance.py
@@ -138,6 +138,9 @@ def launchInstance(params,keyName,keyPath,AMI,AWS_ACCOUNT_ID):
 
     print '\nLaunching AWS instance %s for user %s\n' %(params['instance'],keyName)
 
+    if params['debug'] is True: 
+	print 'version 100'
+
     uname=subprocess.Popen('uname',shell=True, stdout=subprocess.PIPE).stdout.read().strip()
     securityGroupName='sg_%i' %(int(time.time()))
     securityGroupDescript='Automated security group'
@@ -396,7 +399,7 @@ def query_yes_no(question, default="no"):
 #==============================
 if __name__ == "__main__":
 
-    availInstances=['t2.micro','t2.nano','t2.small','t2.medium','t2.large','i2.2xlarge','i2.xlarge','m4.large','m4.xlarge','m4.2xlarge','m4.4xlarge','m4.10xlarge','m4.16xlarge','m3.medium','m3.large','m3.xlarge','m3.2xlarge','c4.large','c4.xlarge','c4.2xlarge','c4.4xlarge','c4.8xlarge','c3.large','c3.xlarge','c3.2xlarge','c3.4xlarge','c3.xlarge','r4.16xlarge','r4.4xlarge','r4.8xlarge','r3.large','r3.xlarge','r3.2xlarge','r3.4xlarge','r3.8xlarge','x1.32xlarge','d2.xlarge','d2.2xlarge','d2.8xlarge','p2.xlarge','p2.8xlarge','p2.16xlarge','g2.2xlarge','g2.8xlarge']
+    availInstances=['t2.micro','t2.nano','t2.small','t2.medium','t2.large','i2.2xlarge','i2.xlarge','m4.large','m4.xlarge','m4.2xlarge','m4.4xlarge','m4.10xlarge','m4.16xlarge','m3.medium','m3.large','m3.xlarge','m3.2xlarge','c4.large','c4.xlarge','c4.2xlarge','c4.4xlarge','c4.8xlarge','c3.large','c3.xlarge','c3.2xlarge','c3.4xlarge','c3.xlarge','r4.16xlarge','r4.4xlarge','r4.8xlarge','r3.large','r3.xlarge','r3.2xlarge','r3.4xlarge','r3.8xlarge','x1.32xlarge','d2.xlarge','d2.2xlarge','d2.8xlarge','p2.xlarge','p2.8xlarge','p2.16xlarge','g3.4xlarge','g3.8xlarge','g3.16xlarge','g2.2xlarge','g2.8xlarge']
 
     params=setupParserOptions()
     if params['listInstance'] is True:

diff --git a/aws_build_linux/create_volume.py b/aws_build_linux/create_volume.py
diff --git a/aws_build_linux/launch_AWS_instance.py b/aws_build_linux/launch_AWS_instance.py