From e747cd296023f0bef770dbf9d68c09ab9c048229 Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Tue, 16 May 2017 08:53:33 +0200
Subject: [PATCH] allow prefix before info messages

---
 lib/vagrant-lxd/action/bootstrap.rb      |  5 ++---
 lib/vagrant-lxd/action/create.rb         |  9 +++++----
 lib/vagrant-lxd/action/ensure_image.rb   | 10 ++++------
 lib/vagrant-lxd/action/ensure_started.rb |  9 +++------
 lib/vagrant-lxd/command.rb               |  8 ++++----
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/lib/vagrant-lxd/action/bootstrap.rb b/lib/vagrant-lxd/action/bootstrap.rb
index 57f7c77..9b117ff 100644
--- a/lib/vagrant-lxd/action/bootstrap.rb
+++ b/lib/vagrant-lxd/action/bootstrap.rb
@@ -14,7 +14,7 @@ module VagrantPlugins
           bs_data = env[:machine].box.metadata["bootstrap"]
 
           bs_data.each do |name, actions|
-            env[:ui].info "--- Bootstrap #{name} ---", :prefix => false
+            env[:ui].info "--- Bootstrap #{name} ---"
             actions.each do |action, data|
               # right now I do not handle differnet actions just return if
               # action is not "exec".
@@ -24,8 +24,7 @@ module VagrantPlugins
               hostname = env[:machine].name
               data.each do |d|
                 d.collect! { |element| ERB.new(element).result(binding) }
-                env[:ui].info "--- #{action}: #{d.inspect} ---",
-                  :prefix => false
+                env[:ui].info "--- #{action}: #{d.inspect} ---"
                 driver.exec(*d, :retryable => true)
               end
             end
diff --git a/lib/vagrant-lxd/action/create.rb b/lib/vagrant-lxd/action/create.rb
index ac0c7a1..bb64788 100644
--- a/lib/vagrant-lxd/action/create.rb
+++ b/lib/vagrant-lxd/action/create.rb
@@ -9,13 +9,14 @@ module VagrantPlugins
 
         def call(env)
           driver = env[:machine].provider.driver
+          config = []
 
           if driver.container?
-            env[:ui].info "--- Container fount ---", :prefix => false
+            env[:ui].info "--- Container fount ---"
           else
-            env[:ui].info "--- Create #{driver.name} ---", :prefix => false
-            driver.create
-            env[:ui].info "--- #{driver.name} created ---", :prefix => false
+            env[:ui].info "--- Create #{driver.name} ---"
+            driver.create env[:machine].provider_config
+            env[:ui].info "--- #{driver.name} created ---"
           end
 
           # TODO maybe not optimal, check if it would be better to include the
diff --git a/lib/vagrant-lxd/action/ensure_image.rb b/lib/vagrant-lxd/action/ensure_image.rb
index 90051d8..f6f22d4 100644
--- a/lib/vagrant-lxd/action/ensure_image.rb
+++ b/lib/vagrant-lxd/action/ensure_image.rb
@@ -11,15 +11,13 @@ module VagrantPlugins
           box = env[:machine].box
           driver = env[:machine].provider.driver
 
-          env[:ui].info "--- check image for #{env[:machine].name} ---",
-            :prefix => false
+          env[:ui].info "--- check image for #{env[:machine].name} ---"
           if driver.image?
-            env[:ui].info "--- Image found ---", :prefix => false
+            env[:ui].info "--- Image found ---"
           else
-            env[:ui].info "--- Image NOT found (downloading) ---",
-              :prefix => false
+            env[:ui].info "--- Image NOT found (downloading) ---"
             driver.get_image("images")
-            env[:ui].info "--- Image download done ---", :prefix => false
+            env[:ui].info "--- Image download done ---"
             # TODO maybe we need to check again if the image really exists
             # now.
           end
diff --git a/lib/vagrant-lxd/action/ensure_started.rb b/lib/vagrant-lxd/action/ensure_started.rb
index 607057c..d39d56c 100644
--- a/lib/vagrant-lxd/action/ensure_started.rb
+++ b/lib/vagrant-lxd/action/ensure_started.rb
@@ -11,14 +11,11 @@ module VagrantPlugins
           driver = env[:machine].provider.driver
 
           if driver.state != :running
-            env[:ui].info "--- start #{driver.name} ---",
-              :prefix => false
+            env[:ui].info "--- start #{driver.name} ---"
             driver.start
-            env[:ui].info "--- #{driver.name} started ---",
-              :prefix => false
+            env[:ui].info "--- #{driver.name} started ---"
           else
-            env[:ui].info "--- #{driver.name} alreay running ---",
-              :prefix => false
+            env[:ui].info "--- #{driver.name} alreay running ---"
           end
 
           @app.call(env)
diff --git a/lib/vagrant-lxd/command.rb b/lib/vagrant-lxd/command.rb
index 11e137c..d93b55f 100644
--- a/lib/vagrant-lxd/command.rb
+++ b/lib/vagrant-lxd/command.rb
@@ -6,10 +6,10 @@ module VagrantPlugins
       # end
 
       def execute
-        @env.ui.info("my own plugin", :prefix => false)
-        @env.ui.info("--- #{@env.inspect} ---", :prefix => false)
-        @env.ui.info("--- #{@local_data_path} ---", :prefix => false)
-        @env.ui.info("--- #{@env.active_machines} ---", :prefix => false)
+        @env.ui.info "my own plugin"
+        @env.ui.info "--- #{@env.inspect} ---"
+        @env.ui.info "--- #{@local_data_path} ---"
+        @env.ui.info "--- #{@env.active_machines} ---"
       end
     end
   end