[Swift-commit] r7640 - SwiftApps/cloud

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-03-07 16:26:53 -0600 (Fri, 07 Mar 2014)
New Revision: 7640

Modified:
   SwiftApps/cloud/addnodes
   SwiftApps/cloud/monitor
Log:
add monitor script

Modified: SwiftApps/cloud/addnodes
===================================================================
--- SwiftApps/cloud/addnodes	2014-03-07 11:20:00 UTC (rev 7639)
+++ SwiftApps/cloud/addnodes	2014-03-07 22:26:53 UTC (rev 7640)
@@ -13,8 +13,6 @@
 source $CONFIG_FILE
 
 WORKER=$(\which worker.pl)
-KEYPAIR="ketan"
-AMI="ami-cf0953a6"
 
 usage (){
     printf "Usage: %s  -a \"<space separated ip addresses in quotes>\" | -n <nodecount> \n" "${0}"
@@ -57,7 +55,7 @@
 addbynum (){
     echo "$1"
     #ec2-run-instance -k <key-name> -n 1 -g <groupname> --instance-type <type> <ami-id>
-    runinst=$(ec2-run-instance -k "$KEYPAIR" -g all -n "$1" --instance-type t1.micro "$AMI")
+    runinst=$(ec2-run-instance -k "$EC2KEYPAIR" -g all -n "$1" --instance-type t1.micro "$EC2AMI")
     echo "Waiting for instances to start"
     sleep 90
     for i in $(echo $runinst | grep -o '\bi-........\b'); do

Modified: SwiftApps/cloud/monitor
===================================================================
--- SwiftApps/cloud/monitor	2014-03-07 11:20:00 UTC (rev 7639)
+++ SwiftApps/cloud/monitor	2014-03-07 22:26:53 UTC (rev 7640)
@@ -1,4 +1,13 @@
-#!/usr/bin/env python
+#!/bin/bash
 
-# Add cloud resources to existing pool
+#set -x
 
+# Import settings
+
+swift_monitor() {
+    
+}
+
+cloud_monitor() {
+}
+