chef-provisioner 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdbca2477c98ef6259c33f2d8e7b7046340e655e
-  data.tar.gz: 4d0065c4ef99661341f375aab2c2881ce944e9fe
+  metadata.gz: ade17022da3a8becf1b3138e2a5ea7ba531cd744
+  data.tar.gz: 86982d7f331dbaaff77ed1adcf800cee7a8d502a
 SHA512:
-  metadata.gz: d1a60f82a92143ffead765827837723235c978ca4e3afcc981b735ffaa192bbfd25f4c8a2482417203bc0e251b9ee4a06f78ecfad979b65e5ba0f119f7e58a51
-  data.tar.gz: 3094c6f7102704a21ffc19174063252b941e7d96dd079e200aa4b74ee4b1ec100fe7ef99ca3cace7a2a8126c6f871484eb14ab0b2088dd01a10da706956f8b65
+  metadata.gz: ac71c3996744f8d12bac476566719029e9e6e6a061bb2fcab8e22f604be47265a54eceb66fb8e12309b1cb1df71726ac7e95a3f622bf811ed8696989b9794441
+  data.tar.gz: 9fbc07de9aaca5d8a8a851976eb7de21cd5ac4c20cc01d9d6802e5b9d3e90008845324f8bce09d6c5e23792075ea2e5aab786e623b71bdd35ae881a5f59707a0

data/lib/chef-provisioner/bootstrap.rb

@@ -9,13 +9,13 @@ module ChefProvisioner
     extend self
     BOOTSTRAP_TEMPLATE = File.read(File.expand_path('../templates/bootstrap.erb', __FILE__)).freeze
 
-    def generate(node_name: '', chef_version: '12.4.1', environment: nil, server: '', first_boot: {}, reinstall: false, audit: false)
+    def generate(node_name: '', chef_version: '12.4.1', environment: nil, server: '', first_boot: {}, reinstall: false, audit: false, force: false, retries: 0)
       node_name = node_name.strip
       server = ChefAPI.endpoint if server.empty?
       run_list = first_boot[:run_list] if first_boot[:run_list] # FIXME - symbolize keys instead of the dup here
       run_list = first_boot['run_list'] if first_boot['run_list']
-      client_pem = ChefProvisioner::Chef.init_server(node_name, run_list: (run_list || []))
       first_boot.merge!( fqdn: node_name, chef_client: {config: {chef_server_url: server}} )
+      client_pem = get_client_key(node_name, run_list, force, retries)
       render(node_name: node_name, client_pem: client_pem, chef_version: chef_version, environment: environment, server: server, first_boot: first_boot, reinstall: reinstall, audit: audit)
     end
 
@@ -24,5 +24,16 @@ module ChefProvisioner
     def render(**kwargs)
       ERB.new(BOOTSTRAP_TEMPLATE).result(OpenStruct.new(**kwargs).instance_eval { binding })
     end
+
+    def get_client_key(node_name, run_list, force, retries)
+      client_pem = ''
+      attempts = 0
+      while client_pem.empty? && attempts < retries
+        client_pem = ChefProvisioner::Chef.init_server(node_name, run_list: (run_list || []), force: force)
+        attempts += 1
+        sleep(5)
+      end
+      client_pem
+    end
   end
 end

data/lib/chef-provisioner/chef.rb

@@ -16,9 +16,10 @@ module ChefProvisioner
       end
     end
 
-    def init_server(name, attributes:{}, run_list:[])
-      key = create_client(name)
-      create_node(name, attributes: attributes, run_list: run_list)
+    def init_server(name, attributes:{}, run_list:[], force: false)
+      nuke(name) if force
+      key = create_client(name) || ''
+      create_node(name, attributes: attributes, run_list: run_list, force: force) unless key.empty?
       key
     end
 

data/lib/chef-provisioner/version.rb

@@ -1,4 +1,4 @@
 # Namespace for our gem
 module ChefProvisioner
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioner
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dale Hamel
@@ -112,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Bootstrap against a chef-zero server
 test_files: []
-has_rdoc: