Support VM password on config + WinRM loop bug

Author: RobbertJanSW

lib/vagrant-cloudstack/action/read_winrm_info.rb

@@ -43,15 +43,13 @@ def read_winrm_info(cloudstack, machine)
           # the username via winrm_info ... yet ;-)
 
           # Read password from file into domain_config
-          if domain_config.vm_password.nil?
-            vmcredentials_file = machine.data_dir.join("vmcredentials")
-            if vmcredentials_file.file?
-              vmcredentials_password = nil
-              File.read(vmcredentials_file).each_line do |line|
-                vmcredentials_password = line.strip
-              end
-              domain_config.vm_password = vmcredentials_password
+          vmcredentials_file = machine.data_dir.join("vmcredentials")
+          if vmcredentials_file.file?
+            vmcredentials_password = nil
+            File.read(vmcredentials_file).each_line do |line|
+              vmcredentials_password = line.strip
             end
+            domain_config.vm_password = vmcredentials_password
           end
 
           transport_info = transport_info.merge({

lib/vagrant-cloudstack/action/run_instance.rb

@@ -37,7 +37,9 @@ def call(env)
 
           store_volumes
 
-          store_password
+          password = wait_for_password
+
+          store_password(password)
 
           configure_networking
 
@@ -381,6 +383,14 @@ def get_communicator_short_name(communicator)
           communicator_short_names[communicator.class.name]
         end
 
+        def get_communicator_connect_attempts(communicator)
+          communicator_connect_attempts = {
+            'VagrantPlugins::CommunicatorSSH::Communicator' => 40,
+            'VagrantPlugins::CommunicatorWinRM::Communicator' => 1
+          }
+          communicator_connect_attempts[communicator.class.name]
+        end
+
         def evaluate_pf_private_port
           return unless @domain_config.pf_private_port.nil?
 
@@ -756,13 +766,14 @@ def generate_ssh_keypair(keyname, account = nil, domainid = nil, projectid = nil
           @domain_config.keypair =  sshkeypair['name']
         end
 
-        def store_password
+        def wait_for_password
           password = nil
-          if @server.password_enabled and @server.respond_to?('job_id')
+
+          if @server.respond_to?('job_id')
             server_job_result = @env[:cloudstack_compute].query_async_job_result({:jobid => @server.job_id})
             if server_job_result.nil?
-              @env[:ui].warn(' -- Failed to retrieve job_result for retrieving the password')
-              return
+              @env[:ui].warn(' -- Failed to retrieve job_result')
+              raise 'ERROR -- Failed to retrieve job_result'
             end
 
             while true
@@ -776,15 +787,28 @@ def store_password
             end
 
             @env[:ui].info("Password of virtualmachine: #{password}")
-            # Set the password on the current communicator
-            @domain_config.vm_password = password
+          end
 
-            # Save password to file
-            vmcredentials_file = @env[:machine].data_dir.join('vmcredentials')
-            vmcredentials_file.open('w') do |f|
-              f.write("#{password}")
-            end
+          password
+        end
+
+        def store_password(password)
+          unless @server.password_enabled
+              @env[:ui].info("VM is not password-enabled. Using virtualmachine password from config")
+              if @domain_config.vm_password.nil?
+                fail "No vm_password configured but VM is not password enabled either!"
+              end
+              password = @domain_config.vm_password
           end
+
+          # Save password to file
+          vmcredentials_file = @env[:machine].data_dir.join('vmcredentials')
+          vmcredentials_file.open('w') do |f|
+            f.write("#{password}")
+          end
+
+          # Set the password on the current communicator
+          @domain_config.vm_password = password
         end
 
         def store_volumes
@@ -829,15 +853,18 @@ def wait_for_communicator_ready
           @env[:metrics]['instance_ssh_time'] = Util::Timer.time do
             # Wait for communicator to be ready.
             communicator_short_name = get_communicator_short_name(@env[:machine].communicate)
+            communicator_connect_attempts = get_communicator_connect_attempts(@env[:machine].communicate)
             @env[:ui].info(
               I18n.t('vagrant_cloudstack.waiting_for_communicator',
                      communicator: communicator_short_name.to_s.upcase)
             )
-            while true
+            connection_attempt = 0
+            while connection_attempt<communicator_connect_attempts
               # If we're interrupted then just back out
               break if @env[:interrupted]
               break if @env[:machine].communicate.ready?
               sleep 2
+              connection_attempt = connection_attempt + 1
             end
           end
           @logger.info("Time for SSH ready: #{@env[:metrics]['instance_ssh_time']}")