knife-rackspace 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODUxNTU1NTRiNTE4MDg2MTczMDM3YmRjN2Q5ZGQyN2M0NWZiZDA4OA==
+    ZjY5N2QxMDNkZTRmNWU4ZTNiZTM4OTZjM2ZiNTAzNTc0NDA2YzFjNw==
   data.tar.gz: !binary |-
-    OWJlMTYxZjM0MTJiYmYxYzFjNTQ1NjRkNWVkM2U4MTY4ZTJiYTQ2Mw==
+    YmIxNTg4Njc1ZDczOWFkMzE2Y2ZhNGU5OWI5MmU1OTdkMmUzMGJlMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGFhYjRmNzY0ZDRlMTNkMGU3YTA2MTFjN2ZlYWQ0ZDRmZmQzNjYzYjY4NTI1
-    ZTQ3OTZmOTA3ZTcxMDMzODA5MzVhOGFiMjhiYjkwNjYzYzVhYTA1ZmQzMzEx
-    NWZjZGU4NjkxMzA5ZWRjMzFhNWIwZTJiZDUxNTNiNWFlYTY4Y2U=
+    YTA4MjgwZDM0NTg5ZmI0Y2RkYzg0NDg3NmY4OGMzNTBhOGU3NTYwNDM0MWRj
+    YTk1ZjM2N2YzZjk1Nzc5ODcyMjRjZDM3ZWIzNTQxMWMxZTI3OTA5MmViYjNm
+    YTdhNzRmZWZkN2EzMWE2NDJiZTNjNzAxZTQ2NzZmNjcxYjRkOGY=
   data.tar.gz: !binary |-
-    MWJmZWQwMzIzZWJmZGM5NDU1ZDk1NGVmZTAxOTkwNTRlNmVkYjM3Y2E5NmJl
-    MzkwNjBhMDhjOGI4OTJhNDg5YWNhZGI5NmUxMTQ3YzgxZWY3YzI3MGU5Y2M3
-    YjdmODdlYzc4OWViYTZmNzdiMzVkZTg4MjMwNzg3NTg3YmZiY2E=
+    YTMwOTg0MzcxMTFlOGM1MTE3NmJlMWI4MGZmYTZmNmVmMDY0NjllMThjZDg2
+    YmUyOTkyZjgyMzJhMjcxY2MwZDI4NDI1ZTE1MzJhM2M2NGJhYTBmYzQxMTM4
+    YTE3ZTEwYmVhZTVjMzljNWFkNzAzNThhYjg2YWM1OGNlODk5NmU=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.8.1
+* KNIFE-335 Wait for RackConnect and/or Service Level automation before bootstrapping
+
 ## v0.8.0
 * KNIFE-68 enable ability to modify ssh port number
 * KNIFE-180 include option to pass :disk_config option to fog for new node bootstrap

data/lib/chef/knife/rackspace_base.rb

@@ -154,7 +154,7 @@ class Chef
         if version_one?
           v1_public_ip(server)
         else
-          v2_public_ip(server)
+          v2_access_ip(server) ? v2_access_ip(server) : v2_public_ip(server)
         end
       end
 
@@ -205,6 +205,10 @@ class Chef
         extract_ipv4_address(private_ips) if private_ips
       end
 
+      def v2_access_ip(server)
+        server.access_ipv4_address == nil ? "" : server.access_ipv4_address
+      end
+
       def extract_ipv4_address(ip_addresses)
         address = ip_addresses.select { |ip| ip["version"] == 4 }.first
         address ? address["addr"] : ""

data/lib/chef/knife/rackspace_server_create.rb

@@ -136,6 +136,18 @@ class Chef
         :proc => Proc.new { |m| Chef::Config[:knife][:rackspace_metadata] = JSON.parse(m) },
         :default => ""
 
+      option :rackconnect_wait,
+        :long => "--rackconnect-wait",
+        :description => "Wait until the Rackconnect automation setup is complete before bootstrapping chef",
+        :boolean => true,
+        :default => false
+
+      option :rackspace_servicelevel_wait,
+        :long => "--rackspace-servicelevel-wait",
+        :description => "Wait until the Rackspace service level automation setup is complete before bootstrapping chef",
+        :boolean => true,
+        :default => false
+
       option :hint,
         :long => "--hint HINT_NAME[=HINT_FILE]",
         :description => "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
@@ -296,6 +308,9 @@ class Chef
         node_name = get_node_name(config[:chef_node_name] || config[:server_name])
         networks = get_networks(Chef::Config[:knife][:rackspace_networks])
 
+        rackconnect_wait = Chef::Config[:knife][:rackconnect_wait] || config[:rackconnect_wait]
+        rackspace_servicelevel_wait = Chef::Config[:knife][:rackspace_servicelevel_wait] || config[:rackspace_servicelevel_wait]
+
         server = connection.servers.new(
           :name => node_name,
           :image_id => Chef::Config[:knife][:image],
@@ -316,6 +331,36 @@ class Chef
         msg_pair("Name", server.name)
         msg_pair("Flavor", server.flavor.name)
         msg_pair("Image", server.image.name)
+        msg_pair("Metadata", server.metadata.all)
+        msg_pair("RackConnect Wait", rackconnect_wait ? 'yes' : 'no')
+        msg_pair("ServiceLevel Wait", rackspace_servicelevel_wait ? 'yes' : 'no')
+
+        # wait for it to be ready to do stuff
+        begin
+          server.wait_for(1200) { 
+            print "."; 
+            Chef::Log.debug("#{progress}%")
+            if rackconnect_wait and rackspace_servicelevel_wait
+              Chef::Log.debug("rackconnect_automation_status: #{metadata.all['rackconnect_automation_status']}")
+              Chef::Log.debug("rax_service_level_automation: #{metadata.all['rax_service_level_automation']}")
+              ready? and metadata.all['rackconnect_automation_status'] == 'DEPLOYED' and metadata.all['rax_service_level_automation'] == 'Complete'
+            elsif rackconnect_wait
+              Chef::Log.debug("rackconnect_automation_status: #{metadata.all['rackconnect_automation_status']}")
+              ready? and metadata.all['rackconnect_automation_status'] == 'DEPLOYED'
+            elsif rackspace_servicelevel_wait
+              Chef::Log.debug("rax_service_level_automation: #{metadata.all['rax_service_level_automation']}")
+              ready? and metadata.all['rax_service_level_automation'] == 'Complete'
+            else
+              ready?
+            end
+          }
+        rescue Fog::Errors::TimeoutError
+          ui.error('Timeout waiting for the server to be created')
+          msg_pair('Progress', "#{server.progress}%")
+          msg_pair('rackconnect_automation_status', server.metadata.all['rackconnect_automation_status'])
+          msg_pair('rax_service_level_automation', server.metadata.all['rax_service_level_automation'])
+          Chef::Application.fatal! 'Server didn\'t finish on time'
+        end
         msg_pair("Metadata", server.metadata)
         if(networks && Chef::Config[:knife][:rackspace_networks])
           msg_pair("Networks", Chef::Config[:knife][:rackspace_networks].sort.join(', '))
@@ -332,6 +377,8 @@ class Chef
         msg_pair("Public IP Address", public_ip(server))
         msg_pair("Private IP Address", private_ip(server))
         msg_pair("Password", server.password)
+        msg_pair("Metadata", server.metadata.all)
+
         #which IP address to bootstrap
         bootstrap_ip_address = public_ip(server)
         if config[:private_network]

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Adam Jacob
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows