opendelivery 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1358ade78b831cacf9c17ce039183064e64203e5
-  data.tar.gz: 86c956e80a49e98d4560e12f73738d8a01929ffb
+  metadata.gz: 12c5b2a2c1a61c9a0ea3fb271717796469e5407f
+  data.tar.gz: 360133cdbdada5f134240233f68425aee93a433a
 SHA512:
-  metadata.gz: 964cbcdab444dfe8baf3789c0df8211ae3ba0ea5753b39219d7d17a7b007f2de833202e2c8ade5bb554d95c7153030557f8ca92f8c9d6cd20e707db2c41b2449
-  data.tar.gz: ce6602bd8c9dfbb8228ec856cd49565f1864b878338f8470a132617c4c96ec6a7599915efbc4e7a9346f19d3006569851dcf3cfe3b89260e8c57ab362b7604e1
+  metadata.gz: fcf3a40b1e1d796d4ca30ce5595e518429801a284bc3355436993469a923f5992a947ff7502390e08e13e1c289d8215269c8be1787a5f6cb885e2120a6ece831
+  data.tar.gz: 6b110b76f05843a760a4e7b77410849800c4c797619ceaccdb9932b331874180e253b9349e7abfbb97993e5d11620cf5482cce803201d557f1306fc2971f688f

data/lib/opsworks.rb

@@ -44,16 +44,40 @@ module OpsWorks
     response = opsworks_client.create_stack(stack_description.stack_description)
     stack_id = response[:stack_id]
 
-    stack_description.layer_descriptions.each do |layer_description|
+    wait_on_opsworks_sg_creation(stack_description.stack_description[:vpc_id]) if stack_description.stack_description[:vpc_id]
+
+    layer_descriptions = stack_description.layer_descriptions
+    layer_descriptions.each do |layer_description|
       layer_description[:layer][:stack_id] = stack_id
 
       response = opsworks_client.create_layer(layer_description[:layer])
       layer_id = response[:layer_id]
+      layer_description[:layer][:layer_id] = layer_id
 
       layer_description[:instances].each do |instance_description|
         instance_description[:stack_id] = stack_id
         instance_description[:layer_ids] = [layer_id]
+
+        save_off = instance_description[:extra_layers]
+        instance_description.delete :extra_layers
         response = opsworks_client.create_instance(instance_description)
+        instance_description[:instance_id] = response[:instance_id]
+        instance_description[:extra_layers] = save_off
+      end
+    end
+
+    layer_descriptions.each do |layer_description|
+      layer_description[:instances].each do |instance_description|
+        if instance_description[:extra_layers]
+          instance_description[:extra_layers].each do |extra_layer_name|
+            found_extra_layer = layer_descriptions.find { |desc| desc[:layer][:name] == extra_layer_name }
+
+            raise "missing extra layer: #{extra_layer_name}" unless found_extra_layer
+            instance_description[:layer_ids] << found_extra_layer[:layer][:layer_id]
+            response = opsworks_client.update_instance(:instance_id => instance_description[:instance_id],
+                                                       :layer_ids => instance_description[:layer_ids])
+          end
+        end
       end
     end
 
@@ -165,6 +189,19 @@ module OpsWorks
 
   private
 
+  def wait_on_opsworks_sg_creation(vpc_id)
+    opsworks_security_group_names.each do |sg_name|
+      while AWS.ec2.security_groups.filter('vpc-id', vpc_id).filter('group-name', sg_name).count == 0
+        puts "Waiting on #{sg_name}, #{a = a ? a+1 : 1}"
+        sleep 1
+      end
+    end
+  end
+
+  def opsworks_security_group_names
+    %w{AWS-OpsWorks-Default-Server AWS-OpsWorks-Blank-Server AWS-OpsWorks-Custom-Server AWS-OpsWorks-Rails-App-Server}
+  end
+
   def deployment_args_factory(app)
     if app[:type] == 'rails'
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opendelivery
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Brian Jakovich
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: encrypto_signo
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +110,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.35.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 description: A collection of tools that are used in the Open Delivery platform.
 email: brian.jakovich@stelligent.com
 executables: []
@@ -117,12 +145,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/opendelivery.rb
-- lib/opsworks.rb
 - lib/opendelivery/domain.rb
 - lib/opendelivery/machine_image.rb
 - lib/opendelivery/source_control.rb
 - lib/opendelivery/stack.rb
 - lib/opendelivery/storage.rb
+- lib/opsworks.rb
 homepage: http://stelligent.com
 licenses:
 - MIT
@@ -144,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Open Delivery tools and utilities