vagrant-azure 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 207488c4092037d099cca2c2a6acf3613fac936f
-  data.tar.gz: 6f59f1b3f44b4a85efff3054008d3d76a1acf44e
+  metadata.gz: 43f278a721762bd2f283486e5447bac6c454e906
+  data.tar.gz: 60b652ce494efc3a0ed89b651e8f94d1c190b8ae
 SHA512:
-  metadata.gz: 7289b26be798fb6f5224d9bafc907e9b74e016394f118395aefa3e23b644fd65c9e608126fe972e1df298305433e36fb084a4b3e8cce617af80388630a154430
-  data.tar.gz: 91de13628bb726493b4b087c7f96d01c2e364660b1eb3a1ed087dc6dd8fffec4e1ce7f137277c076e5edd2417be6499256b37a9ec109b80a8b8ecc0dce1400cf
+  metadata.gz: d228014f82d335a5b0eb8e020afe57dd0079556caa52db9c936d74d575935efd4cba6b460f8edb11e121f2f6d4432f9de0440430d31ad2dad68d899db0718b0c
+  data.tar.gz: 9e72be1bff5934d6ebf5c09dca1ae6580bb9fbba7b546e44731b279058f4fd75ef582a391aa97b080f683406675791a94013ac248b8eb7f1bb006b3603e21ec8

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.6.0'
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
 end
 
 group :plugins do

data/README.md

@@ -112,6 +112,21 @@ The vagrant-azure provide exposes a few Azure specific configration options:
 * `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
+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"
+-ss My -sr CurrentUser -len 2048 -sky exchange -sp "Microsoft Enhanced RSA
+and AES Cryptographic Provider" -sy 24
+
+* makecert.exe -r -pe -a sha1 -n "CN=My Azure RDP Certificate" -ss My -sr CurrentUser -len 2048 -sky exchange -sp "Microsoft Enhanced RSA 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
+
+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.

data/lib/vagrant-azure.rb

@@ -13,14 +13,8 @@ module VagrantPlugins
     autoload :Errors, lib_path.join('errors')
     autoload :Driver, lib_path.join('driver')
 
-    Vagrant.plugin('2').manager.communicators[:winrm]
-    require 'kconv'
-    require lib_path.join('monkey_patch/azure')
-    require lib_path.join('monkey_patch/winrm')
-
     CLOUD_SERVICE_SEMAPHORE = Mutex.new
 
-
     # This returns the path to the source of this plugin.
     #
     # @return [Pathname]

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

@@ -63,7 +63,7 @@ module VagrantPlugins
           config.winrm_https_port.nil?
           options[:availability_set_name] = config.availability_set_name unless \
           config.availability_set_name.nil?
-          options[:vm_virtual_network_name] = config.vm_virtual_network_name unless \
+          options[:virtual_network_name] = config.vm_virtual_network_name unless \
           config.vm_virtual_network_name.nil?
 
           add_role = false

data/lib/vagrant-azure/config.rb

@@ -21,6 +21,7 @@ module VagrantPlugins
       attr_accessor :vm_image
       attr_accessor :vm_location
       attr_accessor :vm_affinity_group
+      attr_accessor :vm_virtual_network_name
 
       attr_accessor :cloud_service_name
       attr_accessor :deployment_name
@@ -59,6 +60,7 @@ module VagrantPlugins
         @vm_image = UNSET_VALUE
         @vm_location = UNSET_VALUE
         @vm_affinity_group = UNSET_VALUE
+        @vm_virtual_network_name = UNSET_VALUE
 
         @cloud_service_name = UNSET_VALUE
         @deployment_name = UNSET_VALUE
@@ -92,6 +94,7 @@ module VagrantPlugins
         @vm_image = nil if @vm_image == UNSET_VALUE
         @vm_location = nil 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
 
         @cloud_service_name = nil if @cloud_service_name == UNSET_VALUE
         @deployment_name = nil if @deployment_name == UNSET_VALUE

data/lib/vagrant-azure/plugin.rb

@@ -33,6 +33,7 @@ module VagrantPlugins
         # Setup logging and i18n
         setup_logging
         setup_i18n
+        apply_patches
 
         # Return the provider
         require_relative 'provider'
@@ -54,6 +55,14 @@ module VagrantPlugins
         VagrantPlugins::WinAzure::Command::RDP
       end
 
+      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
+
       def self.setup_i18n
         I18n.load_path << File.expand_path(
           'locales/en.yml',

data/lib/vagrant-azure/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-azure
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - MSOpenTech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure