vagrant-ignition 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c88275ae9269f72da07adabe390677180369a1
-  data.tar.gz: 7dbe996b07a257d0f8f259eac6e07b1d959c3745
+  metadata.gz: ada054d0fa837f17a1ef4cdb4483c5f32e2eed30
+  data.tar.gz: 603e4595442910affa34e69ab00a7e4b38583f5b
 SHA512:
-  metadata.gz: f53342fa9776f2a01cd07b9bc1fad15e96228caea0ec7d26f40476640f823f2249c3b38017d299da792af84926d2a02a06474c542a47b96fe97768036929d37f
-  data.tar.gz: '07932f791029ba6e6ea9aa94bb37daca62a1a83d552c89ebbe8eae906a163522e9fde167ad3430454c5b510dee7d025387626f98e45263677baf5e080a5c4512'
+  metadata.gz: eee4b8d6b1d977e89bccf30f08d062552bcd41a72c984170bfb7f16b8048ff37bbda2e8b93cef51a1d540fa83ddab38db1869c4ba68aeb677ce27e45e82822c6
+  data.tar.gz: 38052f2dec20f6b6dec03c470053a485fe68354912b3f51db879c1813ca19d06cf85f628d4296ba57d1854e548e253aa2a52e5dcb9f4ed291c1cb495ef1c2b7b

data/README.md

@@ -9,7 +9,7 @@ Build the app using:
 
 And install it with:
 
-    $ vagrant plugin install vagrant-ignition-0.0.1.gem
+    $ vagrant plugin install vagrant-ignition-0.0.2.gem
 
 ## Usage
 To use this plugin, a couple of config options must be set in a project's Vagrantfile config section.
@@ -22,9 +22,9 @@ Options:
 
 `config.ignition.config_obj`: Set equal to `config.vm.provider :virtualbox`
 
-`config.ignition.config_img`: Set to desired location of generated image (optional)
+`config.ignition.drive_root`: Set to desired root directory of generated config drive (optional)
 
-`config.ignition.config_vmdk`: Set to desired location of generated vmdk (optional)
+`config.ignition.drive_name`: Set to desired filename of generated config drive (optional)
 
 `config.ignition.hostname`: Set to desired hostname of the machine (optional)
 

data/lib/vagrant-ignition/action/merge_ignition.rb

@@ -59,7 +59,7 @@ def merge_ignition(ignition_path, hostname, ip, env)
     config[:passwd][:users] += [ssh_entry()]
   end
 
-  File.open(ignition_path + ".merged","w") do |f|
+  File.open(ignition_path + ".merged","wb") do |f|
     f.write(config.to_json)
   end
 end

data/lib/vagrant-ignition/action/setup_ignition.rb

@@ -17,16 +17,16 @@ module VagrantPlugins
           end
 
           config_path = env[:machine].config.ignition.path
-          config_vmdk = env[:machine].config.ignition.config_vmdk
-          config_img = env[:machine].config.ignition.config_img
+          drive_name = env[:machine].config.ignition.drive_name
+          drive_root = env[:machine].config.ignition.drive_root
 
           hostname = env[:machine].config.ignition.hostname
           ip = env[:machine].config.ignition.ip
 
-          vmdk_gen(config_path, config_vmdk, config_img, hostname, ip, env)
+          vmdk_gen(config_path, drive_name, drive_root, hostname, ip, env)
 
           env[:machine].ui.info "Configuring Ignition Config Drive"
-          env[:machine].provider.driver.execute("storageattach", "#{env[:machine].id}", "--storagectl", "IDE Controller", "--device", "0", "--port", "1", "--type", "hdd", "--medium", "#{config_vmdk}")
+          env[:machine].provider.driver.execute("storageattach", "#{env[:machine].id}", "--storagectl", "IDE Controller", "--device", "0", "--port", "1", "--type", "hdd", "--medium", "#{File.join(drive_root, (drive_name + ".vmdk"))}")
 
           # Continue through the middleware chain
           @app.call(env)

data/lib/vagrant-ignition/action/vmdk_gen.rb

@@ -2,7 +2,14 @@
 require_relative 'merge_ignition'
 require_relative 'IgnitionDiskGenerator'
 
-def vmdk_gen(ignition_path, vmdk_name, config_drive, hostname, ip, env)
+def vmdk_gen(ignition_path, drive_name, drive_root, hostname, ip, env)
+  # This ensures changes the directory to the drive_root so the img and
+  # vmdk can be generated in the same directory as well as avoid some
+  # path name bugs
+  orig_dir = Dir.pwd
+  Dir.chdir(drive_root)
+  vmdk_name = drive_name + ".vmdk"
+  config_drive = drive_name + ".img"
   merge_ignition(ignition_path, hostname, ip, env)
   if !ignition_path.nil?
     IgnitionDiskGenerator.create_disk(ignition_path + ".merged", config_drive)
@@ -14,4 +21,5 @@ def vmdk_gen(ignition_path, vmdk_name, config_drive, hostname, ip, env)
     File.delete(vmdk_name)
   end
   env[:machine].provider.driver.execute("internalcommands", "createrawvmdk", "-filename", "#{vmdk_name}", "-rawdisk", "#{config_drive}")
+  Dir.chdir(orig_dir)
 end

data/lib/vagrant-ignition/config.rb

@@ -4,8 +4,8 @@ module VagrantPlugins
       attr_accessor :enabled
       attr_accessor :path
       attr_accessor :config_obj
-      attr_accessor :config_img
-      attr_accessor :config_vmdk
+      attr_accessor :drive_name
+      attr_accessor :drive_root
       attr_accessor :hostname
       attr_accessor :ip
 
@@ -13,8 +13,8 @@ module VagrantPlugins
         @enabled     = UNSET_VALUE
         @path        = UNSET_VALUE
         @config_obj  = UNSET_VALUE
-        @config_img  = UNSET_VALUE
-        @config_vmdk = UNSET_VALUE
+        @drive_name  = UNSET_VALUE
+        @drive_root  = UNSET_VALUE
         @hostname    = UNSET_VALUE
         @ip          = UNSET_VALUE
       end
@@ -22,8 +22,8 @@ module VagrantPlugins
       def finalize!
         @enabled     = false         if @enabled     == UNSET_VALUE
         @path        = nil           if @path        == UNSET_VALUE
-        @config_img  = "config.img"  if @config_img  == UNSET_VALUE
-        @config_vmdk = "config.vmdk" if @config_vmdk == UNSET_VALUE
+        @drive_name  = "config"      if @drive_name  == UNSET_VALUE
+        @drive_root  = "./"          if @drive_path  == UNSET_VALUE
         @hostname    = nil           if @hostname    == UNSET_VALUE
         @ip          = nil           if @ip          == UNSET_VALUE
       end

data/vagrant-ignition.gemspec

@@ -5,7 +5,7 @@ require "vagrant-ignition/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "vagrant-ignition"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Alexander Pavel", "Alex Crawford"]
   spec.email         = ["alex.pavel@coreos.com", "alex.crawford@coreos.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ignition
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexander Pavel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: '"A Vagrant plugin for VirtualBox based machines that creates and mounts