vagrant-azure 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43f278a721762bd2f283486e5447bac6c454e906
-  data.tar.gz: 60b652ce494efc3a0ed89b651e8f94d1c190b8ae
+  metadata.gz: 1a28028fe5fa394ab6535f78e67f8ade729fd709
+  data.tar.gz: 0f5fafc045638222719f0102af678a03707b82b2
 SHA512:
-  metadata.gz: d228014f82d335a5b0eb8e020afe57dd0079556caa52db9c936d74d575935efd4cba6b460f8edb11e121f2f6d4432f9de0440430d31ad2dad68d899db0718b0c
-  data.tar.gz: 9e72be1bff5934d6ebf5c09dca1ae6580bb9fbba7b546e44731b279058f4fd75ef582a391aa97b080f683406675791a94013ac248b8eb7f1bb006b3603e21ec8
+  metadata.gz: ef18dc3206b2267af138b30147492266cb4ad08896365606c530bcb65d5d0c9dcbd59719bb9d53ad962a7a9ec084869111c9f56a9608f8317715d3ab3da6dfcb
+  data.tar.gz: 7d65d14e639d694ec264b9b4d3cadb69c2e0fb5fda34db3e06fc232822f3dffb0570c824b35089bcb7e5d500c925df719401aff6b6a01cea7c8cf136f8675716

data/Gemfile

@@ -12,7 +12,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.3'
 end
 
 group :plugins do

data/README.md

@@ -2,7 +2,7 @@
 
 ![Gem Version](https://badge.fury.io/rb/vagrant-azure.png)
 
-This is a [Vagrant](http://www.vagrantup.com) 1.6.0+ plugin that adds [Microsoft Azure](https://azure.microsoft.com)
+This is a [Vagrant](http://www.vagrantup.com) 1.7.3+ plugin that adds [Microsoft Azure](https://azure.microsoft.com)
 provider to Vagrant, allowing Vagrant to control and provision machines in Microsoft Azure.
 
 ## Usage
@@ -34,37 +34,36 @@ Now edit your ```Vagrantfile``` as shown below and provide all the values as exp
 ```ruby
 Vagrant.configure('2') do |config|
 	config.vm.box = 'azure'
-
-	config.vm.provider :azure do |azure|
+	
+	config.vm.provider :azure do |azure, override|
+		# Mandatory Settings 
 		azure.mgmt_certificate = 'YOUR AZURE MANAGEMENT CERTIFICATE'
 		azure.mgmt_endpoint = 'https://management.core.windows.net'
 		azure.subscription_id = 'YOUR AZURE SUBSCRIPTION ID'
-		azure.storage_acct_name = 'NAME OF YOUR STORAGE ACCOUNT' # optional. A new one will be generated if not provided.
-
 		azure.vm_image = 'NAME OF THE IMAGE TO USE'
-		azure.vm_user = 'PROVIDE A USERNAME' # defaults to 'vagrant' if not provided
-		azure.vm_password = 'PROVIDE A VALID PASSWORD' # min 8 characters. should contain a lower case letter, an uppercase letter, a number and a special character
-
 		azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE' # max 15 characters. contains letters, number and hyphens. can start with letters and can end with letters and numbers
+		
+		# vm_password is optional when specifying the private_key_file with Linux VMs
+		# When building a Windows VM and using WinRM this setting is used to authenticate via WinRM (PowerShell Remoting)
+		azure.vm_password = 'PROVIDE A VALID PASSWORD' # min 8 characters. should contain a lower case letter, an uppercase letter, a number and a special character
+		
+		# Optional Settings
+		azure.storage_acct_name = 'NAME OF YOUR STORAGE ACCOUNT' # optional. A new one will be generated if not provided.
+		azure.vm_user = 'PROVIDE A USERNAME' # defaults to 'vagrant' if not provided
 		azure.cloud_service_name = 'PROVIDE A NAME FOR YOUR CLOUD SERVICE' # same as vm_name. leave blank to auto-generate
 		azure.deployment_name = 'PROVIDE A NAME FOR YOUR DEPLOYMENT' # defaults to cloud_service_name
-		azure.vm_location = 'PROVIDE A LOCATION FOR VM' # e.g., West US
-	  azure.private_key_file = 'PATH TO YOUR KEY FILE'
-	  azure.certificate_file = 'PATH TO YOUR CERTIFICATE FILE'
-
-	  # Provide the following values if creating a *Nix VM
-	  azure.ssh_port = 'A VALID PUBLIC PORT'
-
-	  # Provide the following values if creating a Windows VM
-	  azure.winrm_transport = [ 'http', 'https' ] # this will open up winrm ports on both http (5985) and http (5986) ports
-	  azure.winrm_https_port = 'A VALID PUBLIC PORT' # customize the winrm https port, instead of 5986
-	  azure.winrm_http_port = 'A VALID PUBLIC PORT' # customize the winrm http port, insted of 5985
-
-	  azure.tcp_endpoints = '3389:53389' # opens the Remote Desktop internal port that listens on public port 53389. Without this, you cannot RDP to a Windows VM.
+	    azure.vm_location = 'PROVIDE A LOCATION FOR VM' # e.g., West US
+		
+		# Optional *Nix Settings
+		azure.ssh_port = 'A VALID PUBLIC PORT' # defaults to 22
+		azure.private_key_file = 'Path to your ssh private key file (~/.ssh/id_rsa) to use for passwordless auth. If the id_rsa file is password protected, you will be prompted for the password.'
+	
+		# Optional Windows Settings
+		azure.winrm_transport = [ 'http', 'https' ] # this will open up winrm ports on both http (5985) and http (5986) ports
+		azure.winrm_https_port = 'A VALID PUBLIC PORT' # customize the winrm https port, instead of 5986
+		azure.winrm_http_port = 'A VALID PUBLIC PORT' # customize the winrm http port, insted of 5985
+		azure.tcp_endpoints = '3389:53389' # opens the Remote Desktop internal port that listens on public port 53389. Without this, you cannot RDP to a Windows VM.
 	end
-
-	config.ssh.username = 'YOUR USERNAME' # the one used to create the VM
-	config.ssh.password = 'YOUR PASSWORD' # the one used to create the VM
 end
 ```
 
@@ -82,37 +81,40 @@ Normally, a lot of this options, e.g., ```vm_image```, will be embedded in a box
 
 ## Azure Boxes
 
-The vagrant-azure plugin provides the ability to use ```azure``` boxes with Vagrant. Please see the example box provided in [example_box/ directory](https://github.com/msopentech/vagrant-azure/tree/master/example_box) and follow the instructions there to build an ```azure``` box.
+The vagrant-azure plugin provides the ability to use ```Azure``` boxes with Vagrant. Please see the example box provided in [example_box/ directory](https://github.com/msopentech/vagrant-azure/tree/master/example_box) and follow the instructions there to build an ```azure``` box.
 
 Please see [Vagrant Docs](http://docs.vagrantup.com/v2/) for more details.
 
 ## Configuration
 
-The vagrant-azure provide exposes a few Azure specific configration options:
+The vagrant-azure provide exposes a few Azure specific configuration options:
 
-* `mgmt_certificate` - Your Azure Management certificate which has been uploaded to the Azure portal for your account.
+### Mandatory
+
+* `mgmt_certificate` - Your Azure Management certificate which has been uploaded to the Azure portal for your account. Provide [PEM file path](#pem-generation), PFX file path or raw string.
 * `mgmt_endpoint` - Azure Management endpoint. `https://management.core.windows.net`
 * `subscription_id` - Your Azure Subscription ID.
 * `storage_acct_name` - The Storage account to use when creating VMs.
+* `vm_name` - The name of the created VM.
+
+### Optional
+
 * `vm_user` - The username to create the VM with. Defaults to `vagrant`.
-* `vm_password` - The password to set for the user created with the VM.
+* `vm_password` - The password to set for the user created with the VM. This will override the private_key_file setting.
 * `vm_image` - The name of the image to be used when creating the VM.
-* `vm_name` - The name of the created VM.
-* `vm_size` - The size of the created VM.
+* `vm_size` - The size of the created VM. Use an of the Azure VM Sizes.
 * `vm_virtual_network_name` - The name of a virtual network to connect to
 * `cloud_service_name` - The name of the cloud service under which to create the VM.
 * `deployment_name` - The name to give the deployment in the cloud service and add the VM to.
 * `vm_location` - The location to create the cloud service, storage account.
-* `private_key_file` - The private key file to use for SSH and if WinRM is enabled over HTTP/S.
-* `certificate_file` - The certificate file to use for SSH and if WinRM is enabled over HTTP/S.
+* `private_key_file` - The private key file to use for SSH (~/.ssh/id_rsa) or a [PEM file](#pem-generation).
 * `ssh_port` - To map the internal SSH port 22 to a different public port.
 * `winrm_transport` - Enables or disables WinRm. Allowed values are `http` and `https`.
-* `winrm_https_port` To map the internal WinRM https port 5986 to a different public port.
-* `winrm_http_port` To map the internal WinRM http port 5985 to a different public port.
+* `winrm_https_port` To map the internal WinRM https port 5986 to a different public port. Must be non-empty.
+* `winrm_http_port` To map the internal WinRM http port 5985 to a different public port. Must be non-empty.
 * `tcp_endpoints` - To open any additional ports. E.g., `80` opens port `80` and `80,3389:53389` opens port `80` and `3389`. Also maps the interal port `3389` to public port `53389`
-* 
 
-##Certificate generation
+### Certificate Generation on Windows
 We will use `makecert.exe` distributed as part of the in the Windows 7 SDK.  The following commands will create the required certificates and insert them into the current user’s personal store.
 
 * makecert.exe -r -pe -a sha1 -n "CN=My Azure Management Certificate"
@@ -123,19 +125,56 @@ and AES Cryptographic Provider" -sy 24
 
 * makecert.exe -r -pe -a sha1 -n "CN=My Azure SSL Certificate" -ss My -sr CurrentUser -len 2048 -sky exchange -sp "Microsoft Enhanced RSA and AES Cryptographic Provider" -sy 24
 
-In order to have more details with images in Windows, access: http://blogs.msdn.com/b/cclayton/archive/2012/03/21/windows-azure-and-x509-certificates.aspx
+(In order to have more details with images in Windows)[http://blogs.msdn.com/b/cclayton/archive/2012/03/21/windows-azure-and-x509-certificates.aspx]
+
+### Get Started with Publish Settings
+
+* To create a pfx from the publishsettings, simply download the publishsettings file for your subscription 
+[https://manage.windowsazure.com/publishsettings](https://manage.windowsazure.com/publishsettings/index?client=powershell). Make sure you have this gem installed and
+ run `pfxer --in [path to your .publishsettings file]`. This will create a .pfx from your publish settings file which can 
+ be supplied as a cert parameter for Service Management Commands.
+
+### Get Started with OpenSSL
+
+* Using the following openssl commands to create a cert and upload to Azure Management
+  * Generate public and private `openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout cert.pem -out cert.pem`
+  * Generate public .cer for Azure upload `openssl x509 -inform pem -in cert.pem -outform der -out mgmt.cer`
+  * Upload the `mgmt.cer` to Azure Management through [https://management.azure.com](https://management.azure.com)
+  * Use cert.pem as your cert parameter for Service Management Commands.
+
+### Using your .pem certificate
+
+Vagrant-Azure expects you to use a .pem management certificate as shown below:
+
+```ruby
+Vagrant.configure('2') do |config|
+	config.vm.box = 'azure'
+
+	config.vm.provider :azure do |azure|
+		azure.mgmt_certificate = "#{file_location_of_your_dot_pem}"
+```
+
+## Create Virtual Network
+
+In order to use vagrant-azure's `vm_virtual_network_name` support, create virtual networks using
+[Azure's Command Line Interface](http://azure.microsoft.com/en-us/documentation/articles/virtual-machines-command-line-tools/):
+
+    azure account download
+    azure network vnet create --vnet "vnet-name" --location "West US" --create-new-affinity-group
 
-As Windows Azure is constantly being updated, the Windows Azure images used in this tutorial might be out-of-date.
 
 ## New Commands for `azure` provider
 
 The `azure` provider introduces the following new `vagrant` commands.
 
 * `rdp` - To connect to a Windows VM using RDP. E.g.,
+* `powershell` - To execute remote powershell commands on a Windows VM using WinRM. 
 ```
-C:\> vagrant up --provider=azure
+> vagrant up --provider=azure
 ...
-C:\> vagrant rdp
+> vagrant rdp
+...
+> vagrant powershell
 ```
 
 
@@ -147,10 +186,11 @@ Example Multi Machine Vagrantfile (for building out 3 Windows Virtual Machines)
 ```ruby
 
 Vagrant.configure('2') do |config|
-  config.vm.box = 'azure'
   config.vm.boot_timeout = 1000
 
-  do_common_azure_stuff = Proc.new do |azure|
+  do_common_azure_stuff = Proc.new do |azure, override|
+		override.config.vm.box = 'azure'
+
 		azure.mgmt_certificate = 'YOUR AZURE MANAGEMENT CERTIFICATE'
 		azure.mgmt_endpoint = 'https://management.core.windows.net'
 		azure.subscription_id = 'YOUR AZURE SUBSCRIPTION ID'
@@ -169,29 +209,29 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.define 'first' do |cfg|
-    config.vm.provider :azure do |azure|
+    cfg.vm.provider :azure do |azure, override|
+      do_common_azure_stuff.call azure, override
       azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE'
       azure.tcp_endpoints = '3389:53389' # opens the Remote Desktop internal port that listens on public port 53389. Without this, you cannot RDP to a Windows VM.
       azure.winrm_https_port = 5986
-      do_common_azure_stuff.call azure
     end
   end
 
   config.vm.define 'second' do |cfg|
-    cfg.vm.provider :azure do |azure|
+    cfg.vm.provider :azure do |azure, override|
+      do_common_azure_stuff.call azure, override
       azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE'
       azure.tcp_endpoints = '3389:53390'
       azure.winrm_https_port = 5987
-      do_common_azure_stuff.call azure
     end
   end
 
   config.vm.define 'third' do |cfg|
-    cfg.vm.provider :azure do |azure|
+    cfg.vm.provider :azure do |azure, override|
+      do_common_azure_stuff.call azure, override
       azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE'
       azure.tcp_endpoints = '3389:53391'
       azure.winrm_https_port = 5988
-      do_common_azure_stuff.call azure
     end
   end
 

data/lib/vagrant-azure/action.rb

@@ -6,6 +6,7 @@
 require 'pathname'
 
 require 'vagrant/action/builder'
+require 'vagrant/action/builtin/wait_for_communicator'
 
 module VagrantPlugins
   module WinAzure
@@ -186,7 +187,7 @@ module VagrantPlugins
                   'vagrant_azure.vm_started', :name => $`
               )
               b1.use action_read_winrm_info
-              b1.use WaitForCommunicate
+              b1.use WaitForCommunicator
               b1.use action_provision
             end
           end
@@ -251,7 +252,6 @@ module VagrantPlugins
       autoload :ReadSSHInfo, action_root.join('read_ssh_info')
       autoload :ReadWinrmInfo, action_root.join('read_winrm_info')
       autoload :PowerShellRun, action_root.join('powershell_run')
-      autoload :Provision, action_root.join('provision')
       autoload :OSType, action_root.join('os_type')
       autoload :ReadState, action_root.join('read_state')
       autoload :RestartVM, action_root.join('restart_vm')
@@ -261,7 +261,6 @@ module VagrantPlugins
       autoload :SyncFolders, action_root.join('sync_folders')
       autoload :TerminateInstance, action_root.join('terminate_instance')
       autoload :WaitForState, action_root.join('wait_for_state')
-      autoload :WaitForCommunicate, action_root.join('wait_for_communicate')
     end
   end
 end

data/lib/vagrant-azure/action/os_type.rb

@@ -18,7 +18,7 @@ module VagrantPlugins
 
           unless env[:machine].config.vm.guest
             env[:ui].info 'Determining OS Type By Image'
-            guest_os_type = env[:azure_vm_service].send(:get_os_type, env[:machine].provider_config.vm_image)
+            guest_os_type = env[:azure_vm_service].send(:get_image, env[:machine].provider_config.vm_image).os_type
             env[:machine].config.vm.guest = guest_os_type && guest_os_type.downcase.to_sym
             if env[:machine].config.vm.guest == :windows && env[:machine].config.vm.communicator.nil?
               env[:machine].config.vm.communicator = :winrm

data/lib/vagrant-azure/action/read_ssh_info.rb

@@ -16,14 +16,14 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info "Looking for local port #{@port}"
+          env[:ui].detail "Looking for local port #{@port}"
 
           env[:machine_ssh_info] = read_ssh_info(
             env[:azure_vm_service],
             env[:machine]
           )
 
-          env[:ui].info "Found port mapping #{env[:machine_ssh_info][:port]} --> #{@port}"
+          env[:ui].detail "Found port mapping #{env[:machine_ssh_info][:port]} --> #{@port}"
 
           @app.call(env)
         end

data/lib/vagrant-azure/action/read_winrm_info.rb

@@ -16,14 +16,9 @@ module VagrantPlugins
 
         def call(env)
           if env[:machine].config.vm.guest == :windows
-            env[:ui].info 'Looking for WinRM'
-
-            env[:machine_winrm_info] = read_winrm_info(
-              env[:azure_vm_service],
-              env[:machine]
-            )
-
-            env[:ui].info "Found public port #{env[:machine_winrm_info][:port]}"
+            env[:ui].detail 'Looking for WinRM'
+            env[:machine_winrm_info] = read_winrm_info(env[:azure_vm_service], env[:machine])
+            env[:ui].detail "Found public port #{env[:machine_winrm_info][:port]}"
           end
 
           @app.call(env)
@@ -41,14 +36,19 @@ module VagrantPlugins
             return nil
           end
 
-          vm.tcp_endpoints.each do |endpoint|
-            if endpoint[:name] == 'PowerShell'
-              machine.config.winrm.host = "#{vm.cloud_service_name}.cloudapp.net"
-              machine.config.winrm.port = endpoint[:public_port]
-              return { :host => "#{vm.cloud_service_name}.cloudapp.net", :port => endpoint[:public_port] }
+          types = %w(PowerShell WinRm-Http)
+
+          endpoint = vm.tcp_endpoints.reject { |i| !types.include?(i[:name]) }.sort{ |i| i[:name] }.first
+          if endpoint
+            machine.config.winrm.host = "#{vm.cloud_service_name}.cloudapp.net"
+            machine.config.winrm.port = endpoint[:public_port]
+
+            if endpoint[:name] == types[0] # if it's PowerShell, then it's over https so use ssl (cert is self signed)
+                machine.config.winrm.ssl_peer_verification = false
+                machine.config.winrm.transport = :ssl
             end
+            return {:host => "#{vm.cloud_service_name}.cloudapp.net", :port => endpoint[:public_port]}
           end
-
           nil
         end
       end

data/lib/vagrant-azure/action/run_instance.rb

@@ -6,6 +6,7 @@
 require 'log4r'
 require 'json'
 require 'azure'
+require 'openssl'
 
 require 'vagrant/util/retryable'
 
@@ -25,46 +26,42 @@ module VagrantPlugins
 
           # Add the mandatory parameters and options
           params = {
-            vm_name: config.vm_name,
-            vm_user: config.vm_user,
-            image: config.vm_image
+              vm_name: config.vm_name,
+              vm_user: config.vm_user,
+              image: config.vm_image
           }
 
           options = {
-            cloud_service_name: config.cloud_service_name
+              cloud_service_name: config.cloud_service_name
           }
 
 
           # Add the optional parameters and options if not nil
           params[:password] = config.vm_password unless config.vm_password.nil?
           params[:location] = config.vm_location unless config.vm_location.nil?
-          params[:affinity_group] = config.vm_affinity_group unless \
-          config.vm_affinity_group.nil?
-
-          options[:storage_account_name] = config.storage_acct_name unless \
-          config.storage_acct_name.nil?
-          options[:deployment_name] = config.deployment_name unless \
-          config.deployment_name.nil?
-          options[:tcp_endpoints] = config.tcp_endpoints unless \
-            config.tcp_endpoints.nil?
-          options[:private_key_file] = config.private_key_file unless \
-            config.private_key_file.nil?
-          options[:certificate_file] = config.certificate_file unless \
-            config.certificate_file.nil?
-          options[:ssh_port] = config.ssh_port unless \
-          config.ssh_port.nil?
-          options[:vm_size] = config.vm_size unless \
-          config.vm_size.nil?
-          options[:winrm_transport] = config.winrm_transport unless \
-          config.winrm_transport.nil?
-          options[:winrm_http_port] = config.winrm_http_port unless \
-          config.winrm_http_port.nil?
-          options[:winrm_https_port] = config.winrm_https_port unless \
-          config.winrm_https_port.nil?
-          options[:availability_set_name] = config.availability_set_name unless \
-          config.availability_set_name.nil?
-          options[:virtual_network_name] = config.vm_virtual_network_name unless \
-          config.vm_virtual_network_name.nil?
+          params[:affinity_group] = config.vm_affinity_group unless config.vm_affinity_group.nil?
+
+          options[:storage_account_name] = config.storage_acct_name unless config.storage_acct_name.nil?
+          options[:deployment_name] = config.deployment_name unless config.deployment_name.nil?
+          options[:tcp_endpoints] = config.tcp_endpoints unless config.tcp_endpoints.nil?
+
+          unless config.private_key_file.nil? && env[:machine].config.ssh.private_key_path.nil?
+            options[:private_key_file] = File.expand_path(config.private_key_file || env[:machine].config.ssh.private_key_path.first)
+          end
+
+          options[:ssh_port] = config.ssh_port unless config.ssh_port.nil?
+          options[:vm_size] = config.vm_size unless config.vm_size.nil?
+          options[:winrm_transport] = config.winrm_transport unless config.winrm_transport.nil?
+          options[:winrm_http_port] = config.winrm_http_port unless config.winrm_http_port.nil?
+          options[:winrm_https_port] = config.winrm_https_port unless config.winrm_https_port.nil?
+          options[:availability_set_name] = config.availability_set_name unless config.availability_set_name.nil?
+          options[:virtual_network_name] = config.vm_virtual_network_name unless config.vm_virtual_network_name.nil?
+
+
+          if params[:password] && options[:private_key_file]
+            env[:ui].warn('You specified both a password and a private key file. The password will be used rather than ' +
+                                'the private key. If you would like to use asymmetric key auth, do not specify a password.')
+          end
 
           add_role = false
 
@@ -77,8 +74,8 @@ module VagrantPlugins
             if config.cloud_service_name && !config.cloud_service_name.empty?
               begin
                 cloud_service = ManagementHttpRequest.new(
-                  :get,
-                  "/services/hostedservices/#{config.cloud_service_name}?embed-detail=true"
+                    :get,
+                    "/services/hostedservices/#{config.cloud_service_name}?embed-detail=true"
                 ).call
 
                 deployments = cloud_service.css 'HostedService Deployments Deployment'

data/lib/vagrant-azure/config.rb

@@ -34,10 +34,6 @@ module VagrantPlugins
       alias :ssh_private_key_file :private_key_file
       alias :ssh_private_key_file= :private_key_file=
 
-      attr_accessor :certificate_file
-      alias :ssh_certificate_file :certificate_file
-      alias :ssh_certificate_file= :certificate_file=
-
       attr_accessor :ssh_port
       attr_accessor :vm_size
       attr_accessor :winrm_transport
@@ -66,7 +62,6 @@ module VagrantPlugins
         @deployment_name = UNSET_VALUE
         @tcp_endpoints = UNSET_VALUE
         @private_key_file = UNSET_VALUE
-        @certificate_file = UNSET_VALUE
         @ssh_port = UNSET_VALUE
         @vm_size = UNSET_VALUE
         @winrm_transport = UNSET_VALUE
@@ -77,22 +72,17 @@ module VagrantPlugins
       end
 
       def finalize!
-        @storage_acct_name = ENV["AZURE_STORAGE_ACCOUNT"] if \
-          @storage_acct_name == UNSET_VALUE
-        @storage_access_key = ENV["AZURE_STORAGE_ACCESS_KEY"] if \
-          @storage_access_key == UNSET_VALUE
-        @mgmt_certificate = ENV["AZURE_MANAGEMENT_CERTIFICATE"] if \
-          @mgmt_certificate == UNSET_VALUE
-        @mgmt_endpoint = ENV["AZURE_MANAGEMENT_ENDPOINT"] if \
-          @mgmt_endpoint == UNSET_VALUE
-        @subscription_id = ENV["AZURE_SUBSCRIPTION_ID"] if \
-          @subscription_id == UNSET_VALUE
+        @storage_acct_name = ENV['AZURE_STORAGE_ACCOUNT'] if @storage_acct_name == UNSET_VALUE
+        @storage_access_key = ENV['AZURE_STORAGE_ACCESS_KEY'] if @storage_access_key == UNSET_VALUE
+        @mgmt_certificate = ENV['AZURE_MANAGEMENT_CERTIFICATE'] if @mgmt_certificate == UNSET_VALUE
+        @mgmt_endpoint = ENV['AZURE_MANAGEMENT_ENDPOINT'] if @mgmt_endpoint == UNSET_VALUE
+        @subscription_id = ENV['AZURE_SUBSCRIPTION_ID'] if @subscription_id == UNSET_VALUE
 
         @vm_name = nil if @vm_name == UNSET_VALUE
         @vm_user = 'vagrant' if @vm_user == UNSET_VALUE
         @vm_password = nil if @vm_password == UNSET_VALUE
         @vm_image = nil if @vm_image == UNSET_VALUE
-        @vm_location = nil if @vm_location == UNSET_VALUE
+        @vm_location = 'West US' if @vm_location == UNSET_VALUE
         @vm_affinity_group = nil if @vm_affinity_group == UNSET_VALUE
         @vm_virtual_network_name = nil if @vm_virtual_network_name == UNSET_VALUE
 
@@ -100,7 +90,7 @@ module VagrantPlugins
         @deployment_name = nil if @deployment_name == UNSET_VALUE
         @tcp_endpoints = nil if @tcp_endpoints == UNSET_VALUE
         @private_key_file = nil if @private_key_file == UNSET_VALUE
-        @certificate_file = nil if @certificate_file == UNSET_VALUE
+
         @ssh_port = nil if @ssh_port == UNSET_VALUE
         @vm_size = nil if @vm_size == UNSET_VALUE
         @winrm_transport = nil if @winrm_transport == UNSET_VALUE
@@ -125,36 +115,40 @@ module VagrantPlugins
         end
       end
 
-      def merge(other)
-        super.tap do |result|
-          result.mgmt_certificate = other.mgmt_certificate || \
-            self.mgmt_certificate
-          result.mgmt_endpoint = other.mgmt_endpoint || \
-            self.mgmt_endpoint
-          result.subscription_id = other.subscription_id || \
-            self.subscription_id
-          result.storage_acct_name = other.storage_acct_name || \
-            self.storage_acct_name
-          result.storage_access_key = other.storage_access_key || \
-            self.storage_access_key
-        end
-      end
-
       def validate(machine)
         errors = _detected_errors
 
         # Azure connection properties related validation.
-        errors << "vagrant_azure.subscription_id.required" if \
-          @subscription_id.nil?
-        errors << "vagrant_azure.mgmt_certificate.required" if \
-          @mgmt_certificate.nil?
-        errors << "vagrant_azure.mgmt_endpoint.required" if \
-          @mgmt_endpoint.nil?
+        errors << 'vagrant_azure.subscription_id.required' if @subscription_id.nil?
+        errors << 'vagrant_azure.mgmt_certificate.required' if @mgmt_certificate.nil?
+        errors << 'vagrant_azure.mgmt_endpoint.required' if @mgmt_endpoint.nil?
 
         # Azure Virtual Machine related validation
-        errors << "vagrant_azure.vm_name.required" if @vm_name.nil?
+        errors << 'vagrant_azure.vm_name.required' if @vm_name.nil?
+
+        paths = machine.config.ssh.private_key_path
+        unless @vm_password || machine.config.ssh.password || @private_key_file || (paths && paths.count > 0)
+          errors << 'You must provide one of the following: ssh.private_key_path, azure.private_key_file, ssh.password or azure.vm_password.'
+        end
+
+        if (@private_key_file || (paths && paths.count > 0)) && (@vm_password || machine.config.ssh.password)
+          machine.config.ssh.password = @vm_password = nil
+          machine.ui.warn('You specified both private_key and password. Vagrant-Azure will only use the private_key in this case.')
+        end
+
+        if machine.config.ssh.password.nil? && @vm_password
+          machine.config.ssh.password = @vm_password
+        elsif machine.config.ssh.password && @vm_password.nil?
+          @vm_password = machine.config.ssh.password
+        end
+
+        if machine.config.ssh.private_key_path.nil? && @private_key_file
+          machine.config.ssh.private_key_path = [File.expand_path(@private_key_file)]
+        elsif machine.config.ssh.private_key_path && @private_key_file.nil?
+          @private_key_file = File.expand_path(paths.first)
+        end
 
-        { "Windows Azure Provider" => errors }
+        { 'Microsoft Azure Provider' => errors }
       end
     end
   end

data/lib/vagrant-azure/monkey_patch/winrm.rb

@@ -1,77 +1,12 @@
-# patch no_ssl_peer_validation for ssl based winrm
-
-WinRM::HTTP::HttpTransport.class_eval do
-
-  # provide a patch for no peer verification.
-  # the patch exists upstream, but vagrant depends on an older version of winrm
-  def no_ssl_peer_verification!
-    @httpcli.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
-end
-
-WinRM::HTTP::HttpSSL.class_eval do
-
-  # provide a constructor that offers the ability to disable peer verification
-  def initialize(endpoint, user, pass, ca_trust_path = nil, opts)
-    super(endpoint)
-    @httpcli.set_auth(endpoint, user, pass)
-    @httpcli.ssl_config.set_trust_ca(ca_trust_path) unless ca_trust_path.nil?
-    no_sspi_auth! if opts[:disable_sspi]
-    basic_auth_only! if opts[:basic_auth_only]
-    no_ssl_peer_verification! if opts[:no_ssl_peer_verification]
-  end
-end
-
-
 VagrantPlugins::CommunicatorWinRM::WinRMShell.class_eval do
-  EXCEPTIONS = class_variable_get(:@@exceptions_to_retry_on)
-
-  protected
-
-  # patch the timeout being raised from openssl that is not handled properly
-  def execute_shell_with_retry(command, shell, &block)
-    retryable(:tries => @max_tries, :on => EXCEPTIONS, :sleep => 10) do
-      @logger.debug("#{shell} executing:\n#{command}")
-      begin
-        output = session.send(shell, command) do |out, err|
-          block.call(:stdout, out) if block_given? && out
-          block.call(:stderr, err) if block_given? && err
-        end
-      rescue Exception => ex
-        raise Timeout::Error if ex.message =~ /execution expired/ # received not friendly timeout, raise a more friendly error
-        raise # didn't include execution expired, so raise for retryable to handle
-      end
-      @logger.debug("Output: #{output.inspect}")
-      return output
-    end
-  end
-
-  # create a new session using ssl rather than kerberos or plaintext
-  def new_session
-    @logger.info("Attempting to connect to WinRM (patched)...")
-    @logger.info("  - Host: #{@host}")
-    @logger.info("  - Port: #{@port}")
-    @logger.info("  - Username: #{@username}")
-
-    client = ::WinRM::WinRMWebService.new(endpoint, :ssl, endpoint_options)
-    client.set_timeout(@timeout_in_seconds)
-    client.toggle_nori_type_casting(:off) #we don't want coersion of types
-    client
-  end
-
-  # override the internal http endpoint
-  def endpoint
-    "https://#{@host}:#{@port}/wsman"
-  end
-
-  # don't verify azure self signed certs and don't try to use sspi
   def endpoint_options
     {user: @username,
      pass: @password,
      host: @host,
      port: @port,
-     operation_timeout: @timeout_in_seconds,
-     no_ssl_peer_verification: true,
-     disable_sspi: true}
+     basic_auth_only: false,
+     no_ssl_peer_verification: !@config.ssl_peer_verification,
+     disable_sspi: true
+    }
   end
 end

data/lib/vagrant-azure/plugin.rb

@@ -58,8 +58,6 @@ module VagrantPlugins
       def self.apply_patches
         lib_path = Pathname.new(File.expand_path('../../vagrant-azure', __FILE__))
         Vagrant.plugin('2').manager.communicators[:winrm]
-        require 'kconv'
-        require lib_path.join('monkey_patch/azure')
         require lib_path.join('monkey_patch/winrm')
       end
 

data/lib/vagrant-azure/version.rb

@@ -6,6 +6,6 @@
 
 module VagrantPlugins
   module WinAzure
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

data/vagrant-azure.gemspec

@@ -4,56 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-azure/version'
 
 Gem::Specification.new do |s|
-  s.name          = "vagrant-azure"
+  s.name          = 'vagrant-azure'
   s.version       = VagrantPlugins::WinAzure::VERSION
-  s.authors       = ["MSOpenTech"]
-  s.description   = "Enable Vagrant to manage machines in Azure"
-  s.summary       = "Enable Vagrant to manage machines in Azure"
-  s.homepage      = "https://github.com/MSOpenTech/vagrant-azure"
-  s.license       = "Apache 2.0"
-
-  s.require_paths = ["lib"]
-
- # The following block of code determines the files that should be included
-  # in the gem. It does this by reading all the files in the directory where
-  # this gemspec is, and parsing out the ignored files from the gitignore.
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  s.files         = unignored_files
-  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-
-  s.add_runtime_dependency "azure", "0.6.4"
-  s.add_runtime_dependency "httpclient", "2.4.0"
-
-  s.add_development_dependency "bundler", "~> 1.3"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "minitest-reporters"
-  s.add_development_dependency "mocha"
+  s.authors       = %w(MSOpenTech Azure)
+  s.description   = 'Enable Vagrant to manage machines in Azure.'
+  s.summary       = 'Enable Vagrant to manage Windows and Linux machines in Azure.'
+  s.homepage      = 'https://github.com/MSOpenTech/vagrant-azure'
+  s.license       = 'Apache 2.0'
+  s.require_paths = ['lib']
+  s.files         = `git ls-files`.split("\n")
+  s.bindir        = 'bin'
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+
+  s.add_runtime_dependency 'azure',       '0.7.0'
+  s.add_runtime_dependency 'httpclient',  '2.4.0'
+
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'mocha'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-azure
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - MSOpenTech
+- Azure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +109,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Enable Vagrant to manage machines in Azure
+description: Enable Vagrant to manage machines in Azure.
 email: 
 executables: []
 extensions: []
@@ -122,13 +123,13 @@ files:
 - Rakefile
 - dummy.box
 - example_box/README.md
+- example_box/Vagrantfile
 - example_box/metadata.json
 - lib/vagrant-azure.rb
 - lib/vagrant-azure/action.rb
 - lib/vagrant-azure/action/connect_azure.rb
 - lib/vagrant-azure/action/os_type.rb
 - lib/vagrant-azure/action/powershell_run.rb
-- lib/vagrant-azure/action/provision.rb
 - lib/vagrant-azure/action/rdp.rb
 - lib/vagrant-azure/action/read_ssh_info.rb
 - lib/vagrant-azure/action/read_state.rb
@@ -140,7 +141,6 @@ files:
 - lib/vagrant-azure/action/sync_folders.rb
 - lib/vagrant-azure/action/terminate_instance.rb
 - lib/vagrant-azure/action/vagrant_azure_service.rb
-- lib/vagrant-azure/action/wait_for_communicate.rb
 - lib/vagrant-azure/action/wait_for_state.rb
 - lib/vagrant-azure/capabilities/winrm.rb
 - lib/vagrant-azure/command/powershell.rb
@@ -148,12 +148,9 @@ files:
 - lib/vagrant-azure/config.rb
 - lib/vagrant-azure/driver.rb
 - lib/vagrant-azure/errors.rb
-- lib/vagrant-azure/monkey_patch/azure.rb
 - lib/vagrant-azure/monkey_patch/winrm.rb
 - lib/vagrant-azure/plugin.rb
 - lib/vagrant-azure/provider.rb
-- lib/vagrant-azure/provisioner/chef-solo.rb
-- lib/vagrant-azure/provisioner/puppet.rb
 - lib/vagrant-azure/version.rb
 - locales/en.yml
 - templates/provisioners/chef-solo/solo.erb
@@ -178,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Enable Vagrant to manage machines in Azure
+summary: Enable Vagrant to manage Windows and Linux machines in Azure.
 test_files: []
-has_rdoc: 

data/lib/vagrant-azure/action/provision.rb

@@ -1,42 +0,0 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
-# See License.txt in the project root for license information.
-#---------------------------------------------------------------------------
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class Provision < Vagrant::Action::Builtin::Provision
-        # Override the core vagrant method and branch out for windows
-        def run_provisioner(env)
-          env[:machine].id =~ /@/
-          vm = env[:azure_vm_service].get_virtual_machine($`, $')
-          env[:ui].info "VM OS: #{vm.os_type.to_sym}"
-
-          if vm.os_type.to_sym == :Windows
-            env[:ui].info 'Provisioning for Windows'
-
-            case env[:provisioner].class.to_s
-              when 'VagrantPlugins::Shell::Provisioner'
-                env[:provisioner].provision
-              when 'VagrantPlugins::Puppet::Provisioner::Puppet'
-                VagrantPlugins::WinAzure::Provisioner::Puppet.new(
-                    env
-                ).provision_for_windows
-              when 'VagrantPlugins::Chef::Provisioner::ChefSolo'
-                VagrantPlugins::WinAzure::Provisioner::ChefSolo.new(
-                    env
-                ).provision_for_windows
-              else
-                env[:provisioner].provision
-            end
-          else
-            env[:ui].info 'Provisioning using SSH'
-            env[:provisioner].provision
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-azure/action/wait_for_communicate.rb

@@ -1,39 +0,0 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
-# See License.txt in the project root for license information.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'timeout'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class WaitForCommunicate
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::wait_for_communicate')
-        end
-
-        def call(env)
-
-          if !env[:interrupted]
-              # Wait for SSH to be ready.
-              env[:ui].info(I18n.t('vagrant_azure.waiting_for_comm'))
-              while true
-                # If we're interrupted then just back out
-                break if env[:interrupted]
-                break if env[:machine].communicate.ready?
-                sleep 5
-              end
-
-            # Ready and booted!
-            env[:ui].info(I18n.t('vagrant_azure.comm_ready'))
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-azure/monkey_patch/azure.rb

@@ -1,46 +0,0 @@
-
-require 'azure'
-
-# Patch azure-ruby-sdk to enable vhds to be created every millisecond as opposed to every minute...
-Azure::VirtualMachineManagement::Serialization.module_eval do
-  def self.role_to_xml(params, options)
-    builder = Nokogiri::XML::Builder.new do |xml|
-      xml.PersistentVMRole(
-        'xmlns' => 'http://schemas.microsoft.com/windowsazure',
-        'xmlns:i' => 'http://www.w3.org/2001/XMLSchema-instance'
-      ) do
-        xml.RoleName { xml.text params[:vm_name] }
-        xml.OsVersion('i:nil' => 'true')
-        xml.RoleType 'PersistentVMRole'
-
-        xml.ConfigurationSets do
-          provisioning_configuration_to_xml(xml, params, options)
-          xml.ConfigurationSet('i:type' => 'NetworkConfigurationSet') do
-            xml.ConfigurationSetType 'NetworkConfiguration'
-            xml.InputEndpoints do
-              default_endpoints_to_xml(xml, options)
-              tcp_endpoints_to_xml(
-                xml,
-                options[:tcp_endpoints],
-                options[:existing_ports]
-              ) if options[:tcp_endpoints]
-            end
-            if options[:virtual_network_name] && options[:subnet_name]
-              xml.SubnetNames do
-                xml.SubnetName options[:subnet_name]
-              end
-            end
-          end
-        end
-        xml.AvailabilitySetName options[:availability_set_name]
-        xml.Label Base64.encode64(params[:vm_name]).strip
-        xml.OSVirtualHardDisk do
-          xml.MediaLink 'http://' + options[:storage_account_name] + '.blob.core.windows.net/vhds/' + (Time.now.strftime('disk_%Y_%m_%d_%H_%M_%S_%L')) + '.vhd'
-          xml.SourceImageName params[:image]
-        end
-        xml.RoleSize options[:vm_size]
-      end
-    end
-    builder.doc
-  end
-end

data/lib/vagrant-azure/provisioner/chef-solo.rb

@@ -1,178 +0,0 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
-# See License.txt in the project root for license information.
-#--------------------------------------------------------------------------
-
-require "fileutils"
-require "tempfile"
-
-module VagrantPlugins
-  module WinAzure
-    module Provisioner
-      class ChefSolo
-        attr_reader :provisioner
-
-        def initialize(env)
-          @env = env
-          @provisioner = env[:provisioner]
-        end
-
-        def provision_for_windows
-          # Copy the chef cookbooks roles data bags and environment folders to Guest
-          copy_folder_to_guest(provisioner.cookbook_folders)
-          copy_folder_to_guest(provisioner.role_folders)
-          copy_folder_to_guest(provisioner.data_bags_folders)
-          copy_folder_to_guest(provisioner.environments_folders)
-
-          # Upload Encrypted data bag
-          upload_encrypted_data_bag_secret if config.encrypted_data_bag_secret_key_path
-          setup_json
-          setup_solo_config
-          run_chef_solo
-
-          # TODO
-          # delete_encrypted_data_bag_secret
-        end
-
-        def setup_json
-          @env[:machine].env.ui.info I18n.t("vagrant.provisioners.chef.json")
-
-          # Get the JSON that we're going to expose to Chef
-          json = config.json
-          json[:run_list] = config.run_list if !config.run_list.empty?
-          json = JSON.pretty_generate(json)
-
-          # Create a temporary file to store the data so we
-          # can upload it
-          temp = Tempfile.new("vagrant")
-          temp.write(json)
-          temp.close
-
-          remote_file = File.join(config.provisioning_path, "dna.json")
-          @env[:machine].provider.driver.upload(temp.path, remote_file)
-        end
-
-        def setup_solo_config
-          cookbooks_path = guest_paths(provisioner.cookbook_folders)
-          roles_path = guest_paths(provisioner.role_folders)
-          data_bags_path = guest_paths(provisioner.data_bags_folders).first
-          environments_path = guest_paths(provisioner.environments_folders).first
-          source_path = "#{VagrantPlugins::WinAzure.source_root}"
-          template_path = source_path + "/templates/provisioners/chef-solo/solo"
-          setup_config(template_path, "solo.rb", {
-            :cookbooks_path => cookbooks_path,
-            :recipe_url => config.recipe_url,
-            :roles_path => roles_path,
-            :data_bags_path => data_bags_path,
-            :environments_path => environments_path
-          })
-        end
-
-        def setup_config(template, filename, template_vars)
-          # If we have custom configuration, upload it
-          remote_custom_config_path = nil
-          if config.custom_config_path
-            expanded = File.expand_path(
-              config.custom_config_path, @machine.env.root_path)
-            remote_custom_config_path = File.join(
-              config.provisioning_path, "custom-config.rb")
-
-            @env[:machine].provider.driver.upload(expanded, remote_custom_config_path)
-          end
-
-          config_file = Vagrant::Util::TemplateRenderer.render(template, {
-            :custom_configuration => remote_custom_config_path,
-            :file_cache_path => config.file_cache_path,
-            :file_backup_path => config.file_backup_path,
-            :log_level        => config.log_level.to_sym,
-            :verbose_logging  => config.verbose_logging,
-            :http_proxy       => config.http_proxy,
-            :http_proxy_user  => config.http_proxy_user,
-            :http_proxy_pass  => config.http_proxy_pass,
-            :https_proxy      => config.https_proxy,
-            :https_proxy_user => config.https_proxy_user,
-            :https_proxy_pass => config.https_proxy_pass,
-            :no_proxy         => config.no_proxy,
-            :formatter        => config.formatter
-          }.merge(template_vars))
-
-          # Create a temporary file to store the data so we can upload it
-          temp = Tempfile.new("vagrant")
-          temp.write(config_file)
-          temp.close
-
-          remote_file = File.join(config.provisioning_path, filename)
-          @env[:machine].provider.driver.upload(temp.path, remote_file)
-        end
-
-        def run_chef_solo
-          if config.run_list && config.run_list.empty?
-            @env[:machine].ui.warn(I18n.t("vagrant.chef_run_list_empty"))
-          end
-
-          options = [
-            "-c #{config.provisioning_path}/solo.rb",
-            "-j #{config.provisioning_path}/dna.json"
-          ]
-
-          command_env = config.binary_env ? "#{config.binary_env} " : ""
-          command_args = config.arguments ? " #{config.arguments}" : ""
-          command = "#{command_env}#{chef_binary_path("chef-solo")} " +
-            "#{options.join(" ")} #{command_args}"
-          config.attempts.times do |attempt|
-            if attempt == 0
-              @env[:machine].env.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
-            else
-              @env[:machine].env.ui.info I18n.t("vagrant.provisioners.chef.running_solo_again")
-            end
-
-            command
-
-            @env[:machine].provider.driver.run_remote_ps(command) do |type, data|
-              # Output the data with the proper color based on the stream.
-              if (type == :stdout || type == :stderr)
-                @env[:ui].detail data
-              end
-            end
-          end
-
-        end
-
-        def upload_encrypted_data_bag_secret
-          @machine.env.ui.info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
-          @env[:machine].provider.driver.upload(encrypted_data_bag_secret_key_path,
-                        config.encrypted_data_bag_secret)
-        end
-
-        def encrypted_data_bag_secret_key_path
-          File.expand_path(config.encrypted_data_bag_secret_key_path, @env[:machine].env.root_path)
-        end
-
-        def config
-          provisioner.config
-        end
-
-        def guest_paths(folders)
-          folders.map { |parts| parts[2] }
-        end
-
-        # Returns the path to the Chef binary, taking into account the
-        # `binary_path` configuration option.
-        def chef_binary_path(binary)
-          return binary if !config.binary_path
-          return File.join(config.binary_path, binary)
-        end
-
-        def copy_folder_to_guest(folders)
-          folders.each do |type, local_path, remote_path|
-            if type == :host
-              @env[:machine].provider.driver.upload(local_path, remote_path)
-            end
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/vagrant-azure/provisioner/puppet.rb

@@ -1,116 +0,0 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
-# See License.txt in the project root for license information.
-#---------------------------------------------------------------------------
-require 'fileutils'
-require 'tempfile'
-
-module VagrantPlugins
-  module WinAzure
-    module Provisioner
-      class Puppet
-        attr_reader :provisioner
-
-        def initialize(env)
-          @env = env
-          @provisioner = env[:provisioner]
-        end
-
-        def provision_for_windows
-          options = [config.options].flatten
-          @module_paths = provisioner.instance_variable_get('@module_paths')
-          @hiera_config_path = provisioner.instance_variable_get(
-            '@hiera_config_path'
-          )
-          @manifest_file = provisioner.instance_variable_get('@manifest_file')
-
-          # Copy the manifests directory to the guest
-          if config.manifests_path[0].to_sym == :host
-            @env[:machine].provider.driver.upload(
-              File.expand_path(
-                config.manifests_path[1], @env[:machine].env.root_path
-              ),
-              provisioner.manifests_guest_path
-            )
-          end
-
-          # Copy the module paths to the guest
-          @module_paths.each do |from, to|
-            @env[:machine].provider.driver.upload(from.to_s, to)
-          end
-
-          module_paths = @module_paths.map { |_, to| to }
-          unless module_paths.empty?
-            win_paths = []
-            # Prepend the default module path
-            module_paths.unshift('/ProgramData/PuppetLabs/puppet/etc/modules')
-            module_paths.each do |path|
-              path = path.gsub('/', '\\')
-              path = "C:#{path}" if path =~/^\\/
-              win_paths << path
-            end
-
-            # Add the command  line switch to add the module path
-            options << "--modulepath \"#{win_paths.join(';')}\""
-          end
-
-          if @hiera_config_path
-            options << "--hiera_config=#{@hiera_config_path}"
-
-            # Upload Hiera configuration if we have it
-            local_hiera_path = File.expand_path(
-              config.hiera_config_path,
-              @env[:machine].env.root_path
-            )
-
-            @env[:machine].provider.driver.upload(
-              local_hiera_path,
-              @hiera_config_path
-            )
-          end
-
-          options << "--manifestdir #{provisioner.manifests_guest_path}"
-          options << "--detailed-exitcodes"
-          options << @manifest_file
-          options  = options.join(' ')
-
-          # Build up the custome facts if we have any
-          facter = ''
-          unless config.facter.empty?
-            facts = []
-            config.facter.each do |key, value|
-              facts << "FACTER_#{key}='#{value}'"
-            end
-
-            facter = "#{facts.join(' ')}"
-          end
-
-          command = "#{facter}puppet apply #{options}"
-
-          if config.working_directory
-            command = "cd #{config.working_directory} && #{command}"
-          end
-
-          @env[:ui].info I18n.t(
-            'vagrant.provisioners.puppet.running_puppet',
-            manifest: config.manifest_file
-          )
-          @env[:ui].info 'Executing puppet script in Windows Azure VM'
-          @env[:machine].provider.driver.run_remote_ps(command) do |type, data|
-            # Output the data with the proper color based on the stream.
-            if (type == :stdout || type == :stderr)
-              @env[:ui].detail data
-            end
-          end
-        end
-
-        protected
-
-        def config
-          provisioner.config
-        end
-      end
-    end
-  end
-end