aws-kicker 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDhlOWQ3YzllOTdlZTQzNGI1YWQyMjkyYzY1ZDA1ZjE5OTg2NjU3Yw==
+    YTRkMGFhZGQzY2QxYWY4NTU2Nzg0ZTdhNDFhYjJkMzMwOGUwOThmZQ==
   data.tar.gz: !binary |-
-    MDk3ZWExMGE3MzlmYTA4MWU0NzlkODQ5YzdlNDA3MTQzOWExODAxZQ==
+    NDY1MTAyM2UxNGJmM2EyZGI2ZGU2YzQzYjhmZDc3MWM2MjM3YTVjMw==
 SHA512:
   metadata.gz: !binary |-
-    NDFkZTY2ZjY4NDljNDkxZDNlZjliMWY4ODFiZTQwMDk1NjE1YmU1MDI4NWZi
-    MjVmNTEyNTZjYWNmNjc4MmYzNzU3NjNmYzRlNTEwNjYyM2Y1ZDFiYjk0NWMx
-    MTNhNzQ0NTQ4NzA0ZjYwMTczZGQ3MjlhOWQ0YTQxMTc2NDdjZjU=
+    M2ZiY2IyN2YwMzVjNzc1Zjg3MTZmZGNmNTg0MjRkYjhlMWI3NjQwMTUzMTZl
+    YTRkZTZjZDZjMTQ3Y2M0MzMxN2M3M2M5Y2ViMDUxMjFmODJmZWJjOGViMTk2
+    NmRhOTBmYmU0MjNkZTFhMjk5OWIzYzA4ZmY0ZGQxMjc3MGM0M2M=
   data.tar.gz: !binary |-
-    ZWJmNjE3ZTNhOTRmODY4MjFmNmE0Y2M0NTA1ZjllMGUwMjBkMGMxZDIwYWI2
-    YjQ4ODAzYjFhNDg1MzA4YWFjZjBhMDRiOTI2NTg5OTY2ZGY3NjcwYjc1OWU1
-    MDc5MjYzZDY5NGIwYTE2MDM2M2FjMDQ1YmRiZGU4NzMxYTRkYzU=
+    NDYzYWFmYzE0NWZiYjdiOTQ5NDg0MmJmZDQ1YTVhZGVjZDliZjU5ZmI5N2Y0
+    MjM0MjA5MzI5MGMwYmUxNzlhY2ZiNjA2ZjNlYjY5OTVlNWYyZDkxMzJhMWM1
+    YTg2MDM1Yjk3NzcyMzM0YTBhZmVjYjdmNTc1NDcwNzM5MjhjZWU=

data/aws-kicker.gemspec

@@ -25,8 +25,8 @@ The guiding principle is that your Stackfile should be shareable & re-useable by
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_development_dependency('rdoc', '~> 0')
-  gem.add_development_dependency('aruba', '~> 0')
+  gem.add_development_dependency('rdoc', '~> 4.2')
+  gem.add_development_dependency('aruba', '~> 0.6')
   gem.add_development_dependency('rake', '~> 0.9.2')
   gem.add_development_dependency('gem-release', '~> 0.7')
   gem.add_dependency('methadone', '~> 1.2')

data/lib/aws-kicker/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Kicker
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/stack.rb

@@ -33,6 +33,7 @@ module Stack
 
     config[:find_file_paths] = Array.new if config[:find_file_paths].nil?
     config[:mime_encode_user_data] = true if config[:mime_encode_user_data].nil?
+    config[:maintain_dns] = true if config[:maintain_dns].nil?
 
     # build out the full config for each node, supplying defaults from the
     # global config if explicitly supplied
@@ -76,68 +77,69 @@ module Stack
       fqdn = role.to_s + '.' + config[:dns_domain]
 
       if !running_instances[fqdn].nil?
-        puts "Skipping #{fqdn} as it already exists"
-        next
-      end
-
-      # Ubuntu 8.04/Hardy doesn't do full cloud-init, so we have to script setting the hostname
-      libdir = File.realpath(@@gemhome + '/lib')
-
-      bootstrap_abs = Stack.find_file(config, config[:node_details][fqdn][:bootstrap])
-      cloud_config_yaml_abs = Stack.find_file(config, config[:node_details][fqdn][:cloud_config_yaml])
-
-      if config[:mime_encode_user_data]
-        Logger.debug "mime encoding user-data..."
-        multipart_cmd = "#{libdir}/write-mime-multipart #{bootstrap_abs} #{cloud_config_yaml_abs}"
-        user_data = `#{multipart_cmd}`
+        Logger.info "Skipping creation od #{fqdn} instance as it already exists"
+        server = running_instances[fqdn]
       else
-        # Ubuntu Hardy seems to struggle with some mime-encoded user-data
-        # so allow the user to forse submitting user-data un-mimed,
-        # in which case we can only pass one file & it must be the bootstrap script
-        Logger.debug "mime encoding user-data disabled, only sending the bootstrap script"
-        user_data = File.read(bootstrap_abs)
-      end
+        # Ubuntu 8.04/Hardy doesn't do full cloud-init, so we have to script setting the hostname
+        libdir = File.realpath(@@gemhome + '/lib')
+
+        bootstrap_abs = Stack.find_file(config, config[:node_details][fqdn][:bootstrap])
+        cloud_config_yaml_abs = Stack.find_file(config, config[:node_details][fqdn][:cloud_config_yaml])
+
+        if config[:mime_encode_user_data]
+          Logger.debug "mime encoding user-data..."
+          multipart_cmd = "#{libdir}/write-mime-multipart #{bootstrap_abs} #{cloud_config_yaml_abs}"
+          user_data = `#{multipart_cmd}`
+        else
+          # Ubuntu Hardy seems to struggle with some mime-encoded user-data
+          # so allow the user to forse submitting user-data un-mimed,
+          # in which case we can only pass one file & it must be the bootstrap script
+          Logger.debug "mime encoding user-data disabled, only sending the bootstrap script"
+          user_data = File.read(bootstrap_abs)
+        end
 
-      user_data.gsub!(/rentpro-unconfigured/, hostname)
-      user_data.gsub!(/rentpro-stage.local/, config[:dns_domain])
-
-
-      # pp multipart
-      #
-      puts "Bootstraping new instance - #{fqdn}, in #{config[:availability_zone]}, flavor #{config[:node_details][fqdn][:flavor_id]}, image_id #{config[:image_id]}"
-      server = connection.servers.create({
-                                        :name => fqdn,
-                                        :hostname => fqdn,
-                                        :availability_zone => config[:availability_zone],
-                                        :flavor_id => config[:node_details][fqdn][:flavor_id],
-                                        :image_id => config[:image_id],
-                                        :key_name => config[:keypair],
-                                        :user_data => user_data,
-                                        :tags => { 'Name' => fqdn },
-                                        })
-
-      print "Waiting for instance to be ready..."
-      server.wait_for { ready? }
-      puts "#{role.to_s} is booted, #{server.public_ip_address}/#{server.private_ip_address}"
-
-      if false
-      # create/update the public & private DNS for this host
-      Stack.update_dns(role.to_s + '-public.' + config[:dns_domain], server.public_ip_address, config)
-      Stack.update_dns(role.to_s + '-private.' + config[:dns_domain], server.private_ip_address, config)
-
-      # create the dns
-      if (role_details[:publish_private_ip] == true && (!role_details[:publish_private_ip].nil?))
-        ip_address = server.private_ip_address
-      else
-        ip_address = server.public_ip_address
-      end
-      Stack.update_dns(fqdn, ip_address, config)
-      #
-      # is this a wildcard DNS host, then claim the *.domain.net
-      if (role_details[:dns_wildcard] == true && (!role_details[:dns_wildcard].nil?))
-        wildcard = "*." + config[:dns_domain]
-        Stack.update_dns(wildcard, ip_address, config)
+        user_data.gsub!(/rentpro-unconfigured/, hostname)
+        user_data.gsub!(/rentpro-stage.local/, config[:dns_domain])
+
+
+        # pp multipart
+        #
+        puts "Bootstraping new instance - #{fqdn}, in #{config[:availability_zone]}, flavor #{config[:node_details][fqdn][:flavor_id]}, image_id #{config[:image_id]}"
+        server = connection.servers.create({
+                                          :name => fqdn,
+                                          :hostname => fqdn,
+                                          :availability_zone => config[:availability_zone],
+                                          :flavor_id => config[:node_details][fqdn][:flavor_id],
+                                          :image_id => config[:image_id],
+                                          :key_name => config[:keypair],
+                                          :user_data => user_data,
+                                          :tags => { 'Name' => fqdn },
+                                          })
+
+        print "Waiting for instance to be ready..."
+        server.wait_for { ready? }
+        puts "#{role.to_s} is booted, #{server.public_ip_address}/#{server.private_ip_address}"
       end
+
+      if config[:maintain_dns]
+        Logger.info "Updating DNS for #{fqdn}"
+        # create/update the public & private DNS for this host
+        Stack.update_dns(role.to_s + '-public.' + config[:dns_domain], server.public_ip_address, config)
+        Stack.update_dns(role.to_s + '-private.' + config[:dns_domain], server.private_ip_address, config)
+
+        # create the dns
+        if (role_details[:publish_private_ip] == true && (!role_details[:publish_private_ip].nil?))
+          ip_address = server.private_ip_address
+        else
+          ip_address = server.public_ip_address
+        end
+        Stack.update_dns(fqdn, ip_address, config)
+        #
+        # is this a wildcard DNS host, then claim the *.domain.net
+        if (role_details[:dns_wildcard] == true && (!role_details[:dns_wildcard].nil?))
+          wildcard = "*." + config[:dns_domain]
+          Stack.update_dns(wildcard, ip_address, config)
+        end
       end
     end
   end
@@ -148,14 +150,15 @@ module Stack
                           :aws_access_key_id => config[:aws_access_key_id],
                           :aws_secret_access_key => config[:aws_secret_access_key] })
 
-    # pp dns.get_hosted_zone(config[:dns_id])
-
-    bmtw =  dns.zones.get(config[:dns_id])
+    dns.get_hosted_zone(config[:dns_id])
+    bmtw = dns.zones.get(config[:dns_id])
 
     record = bmtw.records.get(fqdn)
     if record
+      Logger.info "Updating #{fqdn} with #{ip_address}"
       record.modify(:value => ip_address) if record
     else
+      Logger.info "Creating #{fqdn} with #{ip_address}"
       bmtw.records.create(:value => ip_address, :name => fqdn, :type => 'A')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-kicker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Simon McCartney
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement