openstudio-aws 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8657855f493b2fe3cff7f91854a633a40d8a4990
-  data.tar.gz: 5ec5770c133123d5977bb6722930ee4c18a0e91b
+  metadata.gz: 05896fabcda97abcb347532edcfc7a177c498815
+  data.tar.gz: 920f0bd7ebe65eaede3f224555a04b8a177ef8dc
 SHA512:
-  metadata.gz: 525a3af066ecaa1cda27b34adffca0c2e34eb3df90663f16b5de07bf3b07784cd7e1cb652eab1c528dd3b259548c816dc4da128c311199e4844a36d7f88e8e97
-  data.tar.gz: 8af1f883dff43fc869089bb400131241f125a3e87f2d5d6069de0c245bfd68bd94fb2e3d2367088c38c32b8bdd2f81a5abdf9e021a32eebe4b389a49f27cf588
+  metadata.gz: 6cec51f927a1027f54fac563961a3df91286aa5c6490147187b091887594c9b27f144aa735b95ab72ad684a7d388a58e5c2715270da71ff7806b007c8e53e44b
+  data.tar.gz: ed92542a65387c426876960918dc7497600675aa5c9729ce1927e3262a6d5c52fa3f5861b4f2ae285744f861beeb3264883911eb96dccc1529f11c110b4896dd

data/lib/openstudio/aws/aws.rb

@@ -138,7 +138,7 @@ module OpenStudio
       def create_workers(number_of_instances, options = {}, _user_id = 'unknown_user')
         defaults = {
           instance_type: 'm2.4xlarge',
-          security_group: 'openstudio-worker-sg-v1',
+          security_group: 'openstudio-server-sg-v1',
           image_id: @default_amis[:server],
           user_id: 'unknown_user',
 

data/lib/openstudio/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Aws
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/lib/openstudio/lib/server_script.sh

@@ -1,10 +1,11 @@
-#!/bin/sh
-
-# NOTE: This file is now the main script -- OpenStudio's version is now out of date
+#!/bin/bash
 
 # AWS Server Bootstrap File
 # This script is used to configure the AWS boxes
 
+# Unlock the user account
+sudo passwd -u ubuntu
+
 # Change Host File Entries
 ENTRY="localhost localhost master"
 FILE=/etc/hosts
@@ -14,9 +15,6 @@ else
   sh -c "echo $ENTRY >> /etc/hosts"
 fi
 
-rm -rf /mnt
-mkdir /mnt
-
 # copy all the setup scripts to the appropriate home directory
 # the scripts are called by the AWS connector for passwordless ssh config
 cp /data/launch-instance/setup* /home/ubuntu/
@@ -27,17 +25,36 @@ chown ubuntu:ubuntu /home/ubuntu/setup*
 service delayed_job stop
 service apache2 stop
 service mongodb stop
+service mongod stop
 
 # remove mongo db & add it back
 mkdir -p /mnt/mongodb/data
 chown mongodb:nogroup /mnt/mongodb/data
 rm -rf /var/lib/mongodb
 
-# restart mongo
+# restart mongo - old images has mongodb as the service. New ones use mongod
 service mongodb start
+service mongod start
+
 # delay the continuation because mongo is a forked process and when it initializes
 # it has to create the preallocated journal files (takes ~ 90 seconds on a slower system)
-sleep 2m
+# Wait until mongo logs that it's ready (or timeout after 120s)
+COUNTER=0
+MONGOLOG=/var/log/mongo/mongod.log
+
+# Clear out the log first
+cat /dev/null > $MONGOLOG
+
+grep -q 'waiting for connections on port' $MONGOLOG
+while [[ $? -ne 0 && $COUNTER -lt 120 ]] ; do
+    sleep 2
+    let COUNTER+=2
+    echo "Waiting for mongo to initialize... ($COUNTER seconds so far)"
+    grep -q 'waiting for connections on port' $MONGOLOG
+done
+
+# Now we know mongo is ready and can continue with other commands
+echo "Mongo is ready. Moving on..."
 
 # restart the rails application
 service apache2 stop
@@ -81,10 +98,6 @@ service Rserve restart
 # restart delayed jobs
 service delayed_job start
 
-# Delay 1 minutes to make sure everything had tme to start.
-# This is a hack, sorry.
-sleep 1m
-
 #file flag the user_data has completed
 cat /dev/null > /home/ubuntu/user_data_done
 

data/lib/openstudio/lib/worker_script.sh.template

@@ -1,9 +1,11 @@
-#!/bin/sh
-# NOTE: This file is now the main script to configure AWS workers
+#!/bin/bash
 
 # AWS Worker Bootstrap File
 # File used to configure worker nodes on AWS
 
+# Unlock the user account
+sudo passwd -u ubuntu
+
 # Change Host File Entries
 ENTRY="SERVER_IP SERVER_HOSTNAME SERVER_ALIAS"
 FILE=/etc/hosts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp