zergrush_vagrant 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9d05ffdabe866d953c3d4843a35f61474dc4bb7a
-  data.tar.gz: 308b4850e66d12ba0a74e079ec6a5f8bd656886b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWExNGZkYTkwYjcyYzNmYTYwM2JlMjQxYTgxYTU1MGIxYTllZjM3Mw==
+  data.tar.gz: !binary |-
+    MjRjMTYyYWFmODJjMzNkODdlMmYyZDg1MWU1MTc2YjgwMmRmYTc4OQ==
 SHA512:
-  metadata.gz: 3479adb61b19b289465baa309cc75f9e0c84c6a5c386e1c21feacea8b57425537b8566ae7553c5b8a9261eb802919b343af4a50bc671e73598f9cec7664b1255
-  data.tar.gz: 932c6de8c74136f14b7ee32523d58a0c271b747cae04a92ffdf9ba396379455351b069bf0b8ee4a1fb5c9b60ffec2b246c9fbd5755c97259b33755bb86f41807
+  metadata.gz: !binary |-
+    ZGY0NmUwODk4NmYxMGQ2Y2ZkZGQzYWQ1NjZmM2JhMjExMzlhYzczYjI4NjVl
+    YzA1MDRjMjFkMmM0MTRkMGJiOWQ3MGExYWU3YjI5MDJkNDc1M2Y5MDg3M2Yz
+    M2QwNzc1YTA4NmNlYWRmYjQzZTExMmYxMDJjYWQxMTNmNDFjNWE=
+  data.tar.gz: !binary |-
+    MWFjZjdhZDZjZDFmZjcxN2MyNTFhN2JmZjQzNjdlZThiNzU1MzJiMjk4ZmM5
+    NGFhMjE5ZmM0MzhmODljZmY4MDQyNWFhZjQxZjY1YzA4NjE2NWY2YjE2NzFj
+    ZDFiMzVlZDMyYzgwNzU3NWM5ZDdjMzJmODliOWUzMWM4ZmY2Y2U=

data/lib/zergrush_vagrant/renderer.rb

@@ -86,7 +86,7 @@ class Renderer
             provider = last_defined_driveroption["providertype"]
 
             # unique name
-            unique_name = "zergling_#{index}_#{SecureRandom.hex(20)}"
+            unique_name = "zergling-#{index}-#{Digest::SHA1.hexdigest("#{@name}#{provider}#{last_defined_vm["basebox"]}#{@hive_location}")}"
 
             # render provider details to string
             provider_specifics = ""
@@ -256,6 +256,7 @@ class Renderer
 
             sources = {
                 :machine_name => "zergling_#{index}",
+                :node_name => unique_name,
                 :basebox_path => last_defined_vm["basebox"],
                 :box_name => Digest::SHA1.hexdigest("#{@name}#{provider}#{last_defined_vm["basebox"]}"),
                 :provider => provider,

data/lib/zergrush_vagrant/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module ZergrushVagrant
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/resources/machine.template

@@ -2,6 +2,7 @@
     config.vm.define "<%= machine_name %>" do |<%= machine_name %>|
         <%= machine_name %>.vm.box_url = "<%= basebox_path %>"
         <%= machine_name %>.vm.box = "<%= box_name %>"
+        <%= machine_name %>.vm.host_name = "<%= node_name %>"
         
 <%= ssh_specifics -%>
 
@@ -17,7 +18,9 @@
         tasks = JSON.parse(<%= tasks_array %>)
         tasks.each { |task| 
             if task["type"] == "chef_client" || task["type"] == "chef_solo"
-                <%= machine_name %>.omnibus.chef_version = :latest   
+                <%= machine_name %>.omnibus.chef_version = :latest
+                <%= machine_name %>.butcher.enabled = true 
+                <%= machine_name %>.butcher.verify_ssl = false 
             end
 
             <%= machine_name %>.vm.provision "#{task["type"]}" do |provisioner| 

data/zergrush_vagrant.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"
-  s.add_development_dependency "zergrush", ">= 0.0.6"
+  s.add_development_dependency "zergrush", ">= 0.0.7"
 
   s.add_dependency "ipaddress"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zergrush_vagrant
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - MTN Satellite Communications
@@ -14,56 +14,56 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: zergrush
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant driver for zergrush
@@ -104,12 +104,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []