vagrant-aws-winrm 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a02e0971fbf52b6c23a53a184516e9499ada281
-  data.tar.gz: dcbb6111672aef8e843a80a2408db859b6633111
+  metadata.gz: 4aeb0b26db8e736561eea741413d6ebc9dd539d6
+  data.tar.gz: 14d589f4439c8fbe0e1d62dd60e98af81414cdc1
 SHA512:
-  metadata.gz: 3844578b7beadccfbcae9c7c34436abfc7161e8e83b6705e5840923460f8c56a819a8d95e0665aacf2c8b8e1ca70e7e7e2c84eacd30d5c23eb75038d2fe66d08
-  data.tar.gz: f6638f17b9d85a788dd58062218ca2babbcd017d5d28bc8acfbd7f82bda39213cbb4c52dd4d259413b8e59c46750d32192d81fce8d393d7f2e5ca34d31237ec5
+  metadata.gz: daf07e30a3cd32df7007f80b7dd25dd3340f7df93b9699b84b1f65f78a38fa5d1e5a8fb8648f7965230d5557697e9e44e19ca8bad5209f346d9475c9fdb2e126
+  data.tar.gz: c4523c8ad7ffb32e2d5c6129d1cb97cdc2b1914b61d40d217f5e382364107292ba00f6f7102ef26ac18c93ab4c55a649f83e5761004eb3aff9b6344d61e8c8c1

data/README.md

@@ -18,42 +18,43 @@ In your Vagrantfile, ensure you configure values for `aws.keypair_name` and `ssh
 
 When configuring the WinRM credentials, use `Administrator` and `:aws` for the `winrm.username` and `winrm.password`, respectively.
 
+Additionally, you will need to ensure that you set `aws.security_groups` with a Security Group that allows WinRM inbound (port 5985).
+
+Finally, you can leverage `aws.user_data` to ensure that WinRM is enabled and the Windows Firewall is permitting WinRM inbound.
+
 Example:
 
 ```
 Vagrant.configure("2") do |config|
-  
-  # Other stuff
+  # ... other stuff
 
-  config.vm.provider :aws do |aws, override|
-    aws.access_key_id = "YOUR KEY"
-    aws.secret_access_key = "YOUR SECRET KEY"
-    aws.keypair_name = "KEYPAIR NAME"    
-    override.ssh.private_key_path = "PATH TO YOUR PRIVATE KEY"
-    override.vm.communicator = "winrm"
-    override.winrm.username = "Administrator"
-    override.winrm.password = :aws
-    override.winrm.transport = :ssl
-  end
-end
-```
+  config.vm.communicator = "winrm"
+  config.winrm.username = "Administrator"
 
-## Setting up your server
+  config.vm.provider "aws" do |aws, override|
+    # Indicate that the password should be fetched and decrypted from AWS   
+    override.winrm.password = :aws
 
-You'll have to configure WinRM to use basic authentication. As a result, it is recommended that you configure WinRM to use a HTTPS listener.
+    # private_key_path needed to decrypt the password
+    override.ssh.private_key_path = "PATH TO YOUR PRIVATE KEY"
 
-```
-winrm quickconfig -q
-winrm set winrm/config/service/auth @{Basic="true"}
-winrm create winrm/config/Listener?Address=*+Transport=HTTPS @{CertificateThumbprint="YOUR CERT THUMBPRINT"}
-```
+    # keypair name corresponding to private_key_path
+    aws.keypair_name = "KEYPAIR NAME"
 
-For self-signed SSL certs, you'll have to configure your Vagrantfile to set `winrm.ssl_peer_verification` to false.
+    # Use a security group that allows WinRM port inbound (port 5985)
+    aws.security_groups = ["SOME SECURITY GROUP THAT ALLOWS WINRM INBOUND"]
 
-See also:
+    # Enable WinRM on the instance
+    aws.user_data = <<-USERDATA
+      <powershell>
+        Enable-PSRemoting -Force
+        netsh advfirewall firewall add rule name="WinRM HTTP" dir=in localport=5985 protocol=TCP action=allow
+      </powershell>
+    USERDATA
+  end
+end
 
-* [MSDN article about configuring WinRM](http://msdn.microsoft.com/en-us/library/aa384372\(v=vs.85\).aspx)
-* [WinRM gem](https://github.com/WinRb/WinRM/blob/master/README.md#ssl)
+```
 
 ## Contributing
 

data/lib/vagrant-aws-winrm/capability.rb

@@ -12,8 +12,6 @@ module VagrantPlugins
 
         def self.winrm_info(machine)
           if machine.config.winrm.password == :aws
-            machine.ui.info('Getting WinRM password from AWS...')
-
             # Call the VagrantPlugins::AWS::Action::ConnectAWS
             # middleware so we can get acces to the Fog connection
             machine.env.action_runner.run(
@@ -33,9 +31,19 @@ module VagrantPlugins
           machine = env[:machine]
           aws     = env[:aws_compute]
 
-          response            = aws.get_password_data(machine.id)
-          password_data       = response.body['passwordData']
+          @logger.info('Getting WinRM password from AWS...')
+          response      = aws.get_password_data(machine.id)
+          password_data = response.body['passwordData']
+
+          if password_data.nil?
+            @logger.info('WinRM password not available from AWS yet.')
+            @logger.debug("Raising an exception to force a retry.")
+            raise VagrantPlugins::CommunicatorWinRM::Errors::TransientError, error_message: 'WinRM password not available from AWS yet.'          
+          end 
+
           password_data_bytes = Base64.decode64(password_data)
+
+          machine.ui.info('Decrypting WinRM password from AWS...')         
           
           # Try to decrypt the password data using each one of the private key files
           # set by the user until we hit one that decrypts successfully

data/lib/vagrant-aws-winrm/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module AWS
     module WinRM
-        VERSION = "0.0.6"
+        VERSION = "0.0.7"
     end    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws-winrm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Rafael Goodman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Facilitates using the AWS-EC2-provided Administrator password as the WinRM