init.rb in vagrant-orchestrate-0.0.5

- old
+ new

@@ -7,15 +7,13 @@
     module Command
       class Init < Vagrant.plugin("2", :command)
         include Vagrant::Util
 
         DEFAULT_SHELL_PATH = "{{YOUR_SCRIPT_PATH}}"
-        DEFAULT_SHELL_INLINE = "{{YOUR_SCRIPT_COMMAND}}"
         DEFAULT_WINRM_USERNAME = "{{YOUR_WINRM_USERNAME}}"
         DEFAULT_WINRM_PASSWORD = "{{YOUR_WINRM_PASSWORD}}"
         DEFAULT_SSH_USERNAME = "{{YOUR_SSH_USERNAME}}"
-        DEFAULT_SSH_PASSWORD = "{{YOUR_SSH_PASSWORD}}"
         DEFAULT_SSH_PRIVATE_KEY_PATH = "{{YOUR_SSH_PRIVATE_KEY_PATH}}"
         DEFAULT_PLUGINS = ["vagrant-managed-servers"]
 
         # rubocop:disable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity
         def execute
@@ -25,11 +23,10 @@
           options[:servers] = []
           options[:plugins] = DEFAULT_PLUGINS
           options[:puppet_librarian_puppet] = true
           options[:puppet_hiera] = true
 
-
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant orchestrate init [options]"
             o.separator ""
             o.separator "Options:"
             o.separator ""
@@ -124,16 +121,14 @@
             FileUtils.mkdir_p(File.join(@env.cwd, "manifests"))
             write_file(File.join(@env.cwd, "manifests", "default.pp"), "# Your puppet code goes here", options)
           end
 
           options[:shell_paths] ||= options[:shell_inline] ? [] : [DEFAULT_SHELL_PATH]
-          options[:shell_inline] ||= DEFAULT_SHELL_INLINE
           options[:winrm_username] ||= DEFAULT_WINRM_USERNAME
           options[:winrm_password] ||= DEFAULT_WINRM_PASSWORD
           options[:communicator] ||= "ssh"
           options[:ssh_username] ||= DEFAULT_SSH_USERNAME
-          options[:ssh_password] ||= DEFAULT_SSH_PASSWORD unless options[:ssh_private_key_path]
-          options[:ssh_private_key_path] ||= DEFAULT_SSH_PRIVATE_KEY_PATH
+          options[:ssh_private_key_path] ||= DEFAULT_SSH_PRIVATE_KEY_PATH unless options[:ssh_password]
 
           contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/Vagrantfile"),
                                              provisioners: options[:provisioners],
                                              shell_paths: options[:shell_paths],
                                              shell_inline: options[:shell_inline],