Removing ec2-metadata

ghosthamlet · Jan 2, 2012 · 567840a · 567840a
1 parent cdf5374
commit 567840a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 187 deletions.
diff --git a/bin/ec2 b/bin/ec2
diff --git a/bin/monitor b/bin/monitor
@@ -33,10 +33,13 @@ case "$1" in
 		cd  ~/node-monitor
 		git clone $GIT_PROJECT
 		cp ~/.node-monitor/* /node-monitor/plugins/
+		cd ~/node-monitor/bin
+		wget http://s3.amazonaws.com/ec2metadata/ec2-metadata -r
+		chmod a+x ec2-metadata
 
 		;;
 	'install-debian-with-deps')
-		yes | apt-get install git-core scons curl build-essential openssl libssl-dev
+		yes | apt-get install git-core scons curl build-essential openssl libssl-dev python3.2
 		cd ~/
 		git clone https://github.com/joyent/node.git && cd ~/node
 		git checkout v0.4.8

diff --git a/submodules/constants.js b/submodules/constants.js
@@ -21,7 +21,7 @@ ConstantsManagerModule.prototype.strings.INSTANCE_ID = 'instance-id';
 ConstantsManagerModule.prototype.strings.LOCAL_IPV4 = 'local-ipv4';
 ConstantsManagerModule.prototype.strings.PUBLIC_HOSTNAME = 'public-hostname';
 ConstantsManagerModule.prototype.strings.IP = 'client-ip';
-ConstantsManagerModule.prototype.strings.EC2_METADATA_SCRIPT = '../bin/ec2';
+ConstantsManagerModule.prototype.strings.EC2_METADATA_SCRIPT = '../bin/ec2-metadata';
 ConstantsManagerModule.prototype.strings.CLOUDWATCH_ENABLED = 'cloudwatch_enabled';
 ConstantsManagerModule.prototype.strings.EC2 = 'ec2';
 ConstantsManagerModule.prototype.strings.TRUE = 'true';

diff --git a/submodules/utilities.js b/submodules/utilities.js
@@ -44,10 +44,11 @@ UtilitiesManagerModule.prototype.autoPopulate = function () {
         require('child_process').exec(
         Module.constants.strings.EC2_METADATA_SCRIPT + ' --' + parameter, function (error, stdout, stderr) {
             if (error) {
-                console.log('Error auto-configuring, exiting');
+                console.log('Error auto-configuring, exiting ' + error);
                 process.exit(1);
             } else {
-                Module.constants.globals[parameter] = stdout; /* Debug */
+                Module.constants.globals[parameter] = stdout; 
+                /* Debug */
                 console.log('Read parameter: ' + parameter + ', with value: ' + stdout);
             }
         });