chef-provisioner 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9060b24040ec2faae87ec415112744e9b8096343
-  data.tar.gz: ec42e07ae52eab81c4c98698e3f808f5aea22fe5
+  metadata.gz: 83694d23fa025448468c6aa38dbdbc70d242b80b
+  data.tar.gz: f4a71ac9acfccc7759711de5a4e88aa4ce1bbd1b
 SHA512:
-  metadata.gz: d799f853b9a7690e653d05c914c1ab30056c70b7a90d6fc22b437a29f1be67aac29245668b26b0f7b8471f61f4c5307481ea026497293246b8a137ea74ec523f
-  data.tar.gz: 7f11e3d6e2d90225ab090a3a2151b537c466b886bcb0e3c9a047adfa0bdc4ddeda74638f05681034e46ce4c7ea77335624d5565f2749a7e9a777e2e3e85b74ce
+  metadata.gz: 7012783e4b8715160b13444a95f7605d86f7ec2f5b2f410efe2d3720b4a369f17fccbc3f810a3c05937d9510e186e8b1a40e601aa22adf2fd9089fdf997e1854
+  data.tar.gz: a4b66de397dfe48d7686d9cd936efe4f4c4fb7ad8c3e69d2680c0aeab37b90cbf56c0bf30f88e65cab9cf7cace795f9381e482d7e6ae373001073086287a7cf1

data/lib/chef-provisioner/bootstrap.rb

@@ -15,8 +15,8 @@ module ChefProvisioner
       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']
       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, profile: profile)
+      client_pem = get_client_key(node_name, environment, 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, chef_cmd: chef_cmd, profile: profile)
     end
 
     private
@@ -25,11 +25,11 @@ module ChefProvisioner
       ERB.new(BOOTSTRAP_TEMPLATE).result(OpenStruct.new(**kwargs).instance_eval { binding })
     end
 
-    def get_client_key(node_name, run_list, force, retries)
+    def get_client_key(node_name, environment, 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)
+        client_pem = ChefProvisioner::Chef.init_server(node_name, environment: environment, run_list: (run_list || []), force: force)
         attempts += 1
         sleep(5)
       end

data/lib/chef-provisioner/chef.rb

@@ -16,10 +16,10 @@ module ChefProvisioner
       end
     end
 
-    def init_server(name, attributes:{}, run_list:[], force: false)
+    def init_server(name, environment: '_default', attributes:{}, run_list:[], force: false)
       nuke(name) if force
       key = create_client(name) || ''
-      create_node(name, attributes: attributes, run_list: run_list) unless key.empty?
+      create_node(name, environment, attributes: attributes, run_list: run_list) unless key.empty?
       key
     end
 
@@ -31,8 +31,9 @@ module ChefProvisioner
       puts e.message
     end
 
-    def create_node(name, attributes:{}, run_list:[])
+    def create_node(name, environment, attributes:{}, run_list:[])
       node = ChefAPI::Resource::Node.create(name: name, run_list: run_list)
+      node.chef_environment = environment
       node.automatic = attributes['automatic'] || {}
       node.default = attributes['default'] || {}
       node.normal = attributes['normal'] || {}

data/lib/chef-provisioner/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioner
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Dale Hamel