stack-kicker 0.0.15 → 0.0.16

data/README.md

@@ -241,6 +241,11 @@ In addition to the the ruby dependencies which gem will install for you, access
 5. Support for AWS EC2 (from aws-kicker)
 5. Support for DNS Updates on instance creation (from aws-kicker)
 
+## Releasing
+
+1. gem bump
+2. gem release
+
 ## Contributing
 
 1. Fork it

data/bin/stack-kicker

@@ -28,7 +28,7 @@ class App
   include Methadone::CLILogging
 
   main do |task|
-    debug { "#{options}" }
+    debug { "options = #{options}" }
     # pass the logger.level into the Stack module
     Stack.log_level(logger.level)
 
@@ -36,6 +36,9 @@ class App
       config = Stack.select_stack(options[:stackfile], options['stack'])
     end
 
+    # pass some command line options into the config
+    config['skip-secgroup-sync-deletes'] = options['skip-secgroup-sync-deletes'].nil? ? false : true
+
     case task
     when 'validate'
       Stack.validate(config)
@@ -74,6 +77,7 @@ class App
   on("--stackfile Stackfile", "Specify an alternative Stackfile")
   on("--stack mystack", "Specify the stack in Stackfile that you want to work with")
   on("--ssh-user USER", "User to be used for SSH access")
+  on("--skip-secgroup-sync-deletes", "Skip deletes during secgroup-sync, handy for running multiple stacks in the one account with overlapping group names")
 
   arg :task, "task to be performed validate|configure-knife|show-stacks|show-stack|show-running|build|replace|delete|secgroup-sync|ssh"
   version Stack::Kicker::VERSION

data/lib/stack-kicker/version.rb

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

data/lib/stack.rb

@@ -201,7 +201,7 @@ module Stack
         Logger.warn "#{config[:key_pair]} isn't available, uploading the key"
 
         # upload the key
-        key =  os.create_keypair({:name=> config[:key_pair], :public_key=> File.read(config[:key_public])})
+        key =  os.create_keypair({:name=> config[:key_pair], :public_key=> File.read(File.expand_path(config[:key_public]))})
         Logger.warn "#{config[:key_pair]} fingerprint=#{key[:fingerprint]}"
       else
         Logger.info "#{config[:key_pair]} fingerprint=#{keypairs[config[:key_pair].to_sym][:fingerprint]}"
@@ -215,7 +215,7 @@ module Stack
       sg_names = security_groups.map { |secgroup, secgroup_details| secgroup_details[:name] }
 
       config[:roles].each do |role, role_details|
-        # is does the secgroup exist?
+        # does the secgroup exist?
         if sg_names.include?(role_details[:security_group])
           Logger.info "security group #{role_details[:security_group]} exists in #{az}"
         else
@@ -575,6 +575,8 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
   end
 
   def Stack.delete_all(config)
+    # check that we have OS_* vars loaded etc
+    Stack.syntax_check(config)
     # this also populates out unspecified defaults, like az
     Stack.populate_config(config)
 
@@ -648,12 +650,16 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
     sg_json.write(secgroup_ips.to_json)
     sg_json.close
 
-    if File.exists?('secgroups.json')
+    # should we skip deletes
+    skip_deletes = config['skip-secgroup-sync-deletes'] ? "--skip-deletes" : ""
+
+    secgroups_json_abs = Stack.find_file(config, "secgroups.json")
+    if File.exists?(secgroups_json_abs)
       Logger.info "Found secgroups.json, syncing secgroups across AZ"
       # run the secgroup-sync tool, across each AZ/REGION
       config[:azs].each do |az|
         Logger.info "Syncing security groups in #{az}"
-        system("stackhelper --os-region-name #{az} secgroup-sync --secgroup-json secgroups.json --additional-group-json #{sg_json.path}")
+        system("stackhelper --os-region-name #{az} secgroup-sync #{skip_deletes} --secgroup-json #{secgroups_json_abs} --additional-group-json #{sg_json.path}")
       end
     else
       Logger.info "No secgroups.json found, skipping secgroup sync"

metadata

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