stack-kicker 0.0.16 → 0.0.18

data/README.md

@@ -28,6 +28,12 @@ So hostnames will be myapp-az1-chef0001, myapp-az1-web0001, myapp-az1-web0002 et
 
 post-install scripts are executed from the same host as stack-kicker is being used, using the same credentials as the current user.  They are can be used to retrieve information from a freshly built node (like certificates from a chef server), so block progress until the chef-client run has completed (we use this to block percona/galera & rabbitmq cluster builds so that the first node is up & running correctly before we try and add another node to the cluster)
 
+### [Global Attributes](id:Global_attributes)
+TODO
+#### :find_file_paths
+An optional array that extends were the find_file fucntion searches for files (find file defaults to ., Stackhome & the gem lib (for shipped templates), the elements of find_file_paths are
+appended to Stackhome
+
 ### [Role Attributes](id:role_attributes)
 Roles have several attributes, which control how & how many nodes are created, and how they are created.  Below shows the default values for these attributes, which can all be overridden.
 

data/bin/stack-kicker

@@ -54,6 +54,8 @@ class App
       Stack.deploy_all(config)
     when 'delete'
       Stack.delete_all(config)
+    when 'secgroup-sync'
+      Stack.secgroup_sync(config)
     else
       error "Sorry, #{task} hasn't been implemented yet"
     end

data/lib/stack-kicker/version.rb

@@ -1,5 +1,5 @@
 module Stack
   module Kicker
-    VERSION = "0.0.16"
+    VERSION = "0.0.18"
   end
 end

data/lib/stack.rb

@@ -342,6 +342,13 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
       config[:site_template] = 'UNKNOWN'
     end
 
+    if config[:metadata].nil?
+      config[:metadata] = Hash.new
+    end
+
+    if config[:find_file_paths].nil?
+      config[:find_file_paths] = Array.new
+    end
 
     if config[:node_details].nil?
       Logger.debug { "Initializing config[:node_details] and config[:azs]" }
@@ -779,8 +786,22 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
 
           Logger.info "Creating #{hostname} in #{node_details[hostname][:az]} with role #{role}"
 
-          # this will get put in /meta.js
-          metadata = { 'region' => node_details[hostname][:az], 'chef_role' => role }
+          # this will get put in /meta.js - should look like this:
+          # {"region": "az-2.region-a.geo-1", "area": "aw2", "az": "az2", "continent": "dev"}
+          metadata = {
+            'region' => node_details[hostname][:az],
+            'continent' => 'unknown', # we could infer this from the region, or default to 'dev'
+            'area' => 'unknown',      # we could infer this from the region-a/region-b
+            'az' => node_details[hostname][:az].split('.')[0].sub(/-/, ''),
+            'chef_role' => role
+          }
+
+          Logger.debug "Generated metadata: #{metadata}"
+          Logger.debug "Supplied metadata: #{config[:metadata]}"
+          # merge with the supplied data, which will override our generated data
+
+          metadata.merge!(config[:metadata])
+          Logger.info "Final metadata: #{metadata}"
 
           os = Stack.connect(config, node_details[hostname][:az])
           newserver = os.create_server(:name => hostname,
@@ -848,10 +869,13 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
     # find a file, using the standard path precedence
     # 1) cwd
     # 2) stackhome
+    # 2) stackhome + find_file_paths
     # 3) gemhome/lib
     dirs = [ './' ]
     dirs.push(config[:stackhome])
-    dirs.push(@@gemhome + '/lib')
+    config[:find_file_paths].each { |fp| dirs.push(File.join(config[:stackhome], fp)) }
+    dirs.push(File.join(@@gemhome, 'lib'))
+    dirs.flatten!
 
     Logger.debug "find_file, looking for #{filename} in #{dirs}"
     filename_fqp = ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-kicker
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc