Moved the userdata logic to configurator.py file.

Author: yadudoc

aws/README.asc

@@ -1,7 +1,5 @@
-Swift cloud on Amazon Web Services
-----------------------------------
-
-
+Swift cloud on Amazon Elastic Compute Cloud
+-------------------------------------------
 
 
 Sign up online
@@ -17,24 +15,33 @@ Password Policy and Credentials in Using IAM.
 
 2. From the navigation menu, click Users.
 
-3. Select your IAM user name.
+3. Select your IAM user name, or create a new one.
 
 4. Click User Actions, and then click Manage Access Keys.
 
 5. Click Create Access Key.
 
 Note: Your keys will look something like this: +
-Access key ID example: AKIAIOSFODNN7EXAMPLE +
+Access key ID example    : AKIAIOSFODNN7EXAMPLE +
 Secret access key example: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY +
 
-6. Click Download Credentials, and store the keys in a secure location.
+6. Click Download Credentials, and store the keys (a .csv file) in a secure location.
 
-Your secret key will no longer be available through the AWS Management Console; you will have the only copy. Keep it confidential in order to protect your account, and never email it. Do not share it outside your organization, even if an inquiry appears to come from AWS or Amazon.com. No one who legitimately represents Amazon will ever ask you for your secret key.
-* TODO
+NOTE: Your secret key will no longer be available through the AWS Management Console;
+you will have the only copy. Keep it confidential in order to protect your account,
+and never email it.
 
 Setup local-machine
 ^^^^^^^^^^^^^^^^^^^
 
+Get the swift-on-cloud repository from git
+[source,bash]
+-----
+git clone git@github.com:yadudoc/swift-on-cloud.git
+cd swift-on-cloud/aws
+-----
+
+
 * TODO
 
 Manage you Cloud resources

aws/aws.py

@@ -65,8 +65,7 @@ def create_security_group(ec2_driver):
     print res
 
 def start_headnode(driver, configs):
-    #userdata   = "\n".join(open("headnode_userdata").readlines())
-    userdata   = open("headnode_userdata").read()
+    userdata   = configurator.getstring("headnode")
 
     size       = NodeSize(id=configs['HEADNODE_MACHINE_TYPE'], name='headnode',
                           ram=None, disk=None, bandwidth=None, price=None, driver=driver)
@@ -94,9 +93,11 @@ def start_worker(driver, configs, worker_names):
         return -1
 
     # Setup userdata
-    userdata   = open("worker_userdata").read()
+    userdata   = configurator.getstring("headnode")
     userdata   = userdata.replace("SET_HEADNODE_IP", headnode.public_ips[0])
 
+    print userdata
+
     list_nodes = []
     for worker_name in worker_names:
         size       = NodeSize(id=configs['WORKER_MACHINE_TYPE'], name=worker_name,
@@ -179,6 +180,9 @@ def help():
         worker_name = args[1]
     start_worker(driver,configs,[worker_name])
 
+elif args[0] == "check_keys":
+    check_keys(driver,configs)
+
 elif args[0] == "start_headnode":
     start_headnode(driver,configs)
 

aws/configs

@@ -1,6 +1,6 @@
-AWS_CREDENTIALS_FILE=/home/yadu/.ssh/boto-test-credentials.csv
+AWS_CREDENTIALS_FILE=~/.ssh/boto-test-credentials.csv
 AWS_KEYPAIR_NAME=boto-test-pair
-AWS_KEYPAIR_FILE=/home/yadu/.ssh/boto-test-pair.pem
+AWS_KEYPAIR_FILE=~/.ssh/boto-test-pair.pem
 
 #ec2-user is the default user on Amazon linux
 #AWS_USERNAME=ec2-user

aws/configurator.py

@@ -26,8 +26,9 @@ def read_configs(config_file):
     config = _read_conf(config_file)
 
     if 'AWS_CREDENTIALS_FILE' in config :
+        config['AWS_CREDENTIALS_FILE'] =  os.path.expanduser(config['AWS_CREDENTIALS_FILE'])
+        config['AWS_CREDENTIALS_FILE'] =  os.path.expandvars(config['AWS_CREDENTIALS_FILE'])
 
-        #print "Credentials file = ", config['AWS_CREDENTIALS_FILE']
         cred_lines    =  open(config['AWS_CREDENTIALS_FILE']).readlines()
         cred_details  =  cred_lines[1].split(',')
         credentials   = { 'AWS_Username'   : cred_details[0],
@@ -36,8 +37,60 @@ def read_configs(config_file):
         config.update(credentials)
     else:
         print "AWS_CREDENTIALS_FILE , Missing"
-        return "AWS_CREDENTIAL_MISSING"
+        print "ERROR: Cannot proceed without access to AWS_CREDENTIALS_FILE"
+        exit(-1)
 
+    if 'AWS_KEYPAIR_FILE' in config:
+        config['AWS_KEYPAIR_FILE'] = os.path.expanduser(config['AWS_CREDENTIALS_FILE'])
+        config['AWS_KEYPAIR_FILE'] = os.path.expandvars(config['AWS_CREDENTIALS_FILE'])
     return config
 
 #configs = read_configs("./configs")
+#pretty_configs(configs)
+
+#!/usr/bin/env python
+
+HEADNODE_USERDATA='''#!/bin/bash
+WORKERPORT="50005"; SERVICEPORT="50010"
+export JAVA=/usr/local/bin/jdk1.7.0_51/bin
+export SWIFT=/usr/local/bin/swift-0.95-RC6/bin
+export PATH=$JAVA:$SWIFT:$PATH
+coaster_loop ()
+{
+    while :
+    do
+        coaster-service -p $SERVICEPORT -localport $WORKERPORT -nosec -passive &> /var/log/coaster-service.logs
+        sleep 10;
+    done
+}
+coaster_loop &
+'''
+
+WORKER_USERDATA='''#!/bin/bash
+HEADNODE=SET_HEADNODE_IP
+WORKERPORT="50005"
+#Ping timeout
+PTIMEOUT=4
+export JAVA=/usr/local/bin/jdk1.7.0_51/bin
+export SWIFT=/usr/local/bin/swift-0.95-RC6/bin
+export PATH=$JAVA:$SWIFT:$PATH
+worker_loop ()
+{
+    while :
+    do
+        echo "Pinging HEADNODE on $HEADNODE"
+        worker.pl http://$HEADNODE:$WORKERPORT 0099 ~/workerlog -w 3600
+        sleep 5
+    done
+}
+worker_loop &
+'''
+
+def getstring(target):
+    if target == "headnode":
+        return HEADNODE_USERDATA
+    elif target == "worker":
+        return WORKER_USERDATA
+    else:
+        return -1
+

aws/headnode_userdata

@@ -36,8 +36,6 @@ git clone git@github.com:yadudoc/swift-on-cloud.git
 cd swift-on-cloud/compute-engine
 -----
 
-
-
 Manage you Cloud resources
 ^^^^^^^^^^^^^^^^^^^^^^^^^^