vagrant-azure 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 207488c4092037d099cca2c2a6acf3613fac936f
4
- data.tar.gz: 6f59f1b3f44b4a85efff3054008d3d76a1acf44e
3
+ metadata.gz: 43f278a721762bd2f283486e5447bac6c454e906
4
+ data.tar.gz: 60b652ce494efc3a0ed89b651e8f94d1c190b8ae
5
5
  SHA512:
6
- metadata.gz: 7289b26be798fb6f5224d9bafc907e9b74e016394f118395aefa3e23b644fd65c9e608126fe972e1df298305433e36fb084a4b3e8cce617af80388630a154430
7
- data.tar.gz: 91de13628bb726493b4b087c7f96d01c2e364660b1eb3a1ed087dc6dd8fffec4e1ce7f137277c076e5edd2417be6499256b37a9ec109b80a8b8ecc0dce1400cf
6
+ metadata.gz: d228014f82d335a5b0eb8e020afe57dd0079556caa52db9c936d74d575935efd4cba6b460f8edb11e121f2f6d4432f9de0440430d31ad2dad68d899db0718b0c
7
+ data.tar.gz: 9e72be1bff5934d6ebf5c09dca1ae6580bb9fbba7b546e44731b279058f4fd75ef582a391aa97b080f683406675791a94013ac248b8eb7f1bb006b3603e21ec8
data/Gemfile CHANGED
@@ -12,7 +12,7 @@ group :development do
12
12
  # We depend on Vagrant for development, but we don't add it as a
13
13
  # gem dependency because we expect to be installed within the
14
14
  # Vagrant environment itself using `vagrant plugin`.
15
- gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.0'
15
+ gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
16
16
  end
17
17
 
18
18
  group :plugins do
data/README.md CHANGED
@@ -112,6 +112,21 @@ The vagrant-azure provide exposes a few Azure specific configration options:
112
112
  * `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`
113
113
  *
114
114
 
115
+ ##Certificate generation
116
+ 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.
117
+
118
+ * makecert.exe -r -pe -a sha1 -n "CN=My Azure Management Certificate"
119
+ -ss My -sr CurrentUser -len 2048 -sky exchange -sp "Microsoft Enhanced RSA
120
+ and AES Cryptographic Provider" -sy 24
121
+
122
+ * 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
123
+
124
+ * 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
125
+
126
+ 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
127
+
128
+ As Windows Azure is constantly being updated, the Windows Azure images used in this tutorial might be out-of-date.
129
+
115
130
  ## New Commands for `azure` provider
116
131
 
117
132
  The `azure` provider introduces the following new `vagrant` commands.
data/lib/vagrant-azure.rb CHANGED
@@ -13,14 +13,8 @@ module VagrantPlugins
13
13
  autoload :Errors, lib_path.join('errors')
14
14
  autoload :Driver, lib_path.join('driver')
15
15
 
16
- Vagrant.plugin('2').manager.communicators[:winrm]
17
- require 'kconv'
18
- require lib_path.join('monkey_patch/azure')
19
- require lib_path.join('monkey_patch/winrm')
20
-
21
16
  CLOUD_SERVICE_SEMAPHORE = Mutex.new
22
17
 
23
-
24
18
  # This returns the path to the source of this plugin.
25
19
  #
26
20
  # @return [Pathname]
@@ -63,7 +63,7 @@ module VagrantPlugins
63
63
  config.winrm_https_port.nil?
64
64
  options[:availability_set_name] = config.availability_set_name unless \
65
65
  config.availability_set_name.nil?
66
- options[:vm_virtual_network_name] = config.vm_virtual_network_name unless \
66
+ options[:virtual_network_name] = config.vm_virtual_network_name unless \
67
67
  config.vm_virtual_network_name.nil?
68
68
 
69
69
  add_role = false
@@ -21,6 +21,7 @@ module VagrantPlugins
21
21
  attr_accessor :vm_image
22
22
  attr_accessor :vm_location
23
23
  attr_accessor :vm_affinity_group
24
+ attr_accessor :vm_virtual_network_name
24
25
 
25
26
  attr_accessor :cloud_service_name
26
27
  attr_accessor :deployment_name
@@ -59,6 +60,7 @@ module VagrantPlugins
59
60
  @vm_image = UNSET_VALUE
60
61
  @vm_location = UNSET_VALUE
61
62
  @vm_affinity_group = UNSET_VALUE
63
+ @vm_virtual_network_name = UNSET_VALUE
62
64
 
63
65
  @cloud_service_name = UNSET_VALUE
64
66
  @deployment_name = UNSET_VALUE
@@ -92,6 +94,7 @@ module VagrantPlugins
92
94
  @vm_image = nil if @vm_image == UNSET_VALUE
93
95
  @vm_location = nil if @vm_location == UNSET_VALUE
94
96
  @vm_affinity_group = nil if @vm_affinity_group == UNSET_VALUE
97
+ @vm_virtual_network_name = nil if @vm_virtual_network_name == UNSET_VALUE
95
98
 
96
99
  @cloud_service_name = nil if @cloud_service_name == UNSET_VALUE
97
100
  @deployment_name = nil if @deployment_name == UNSET_VALUE
@@ -33,6 +33,7 @@ module VagrantPlugins
33
33
  # Setup logging and i18n
34
34
  setup_logging
35
35
  setup_i18n
36
+ apply_patches
36
37
 
37
38
  # Return the provider
38
39
  require_relative 'provider'
@@ -54,6 +55,14 @@ module VagrantPlugins
54
55
  VagrantPlugins::WinAzure::Command::RDP
55
56
  end
56
57
 
58
+ def self.apply_patches
59
+ lib_path = Pathname.new(File.expand_path('../../vagrant-azure', __FILE__))
60
+ Vagrant.plugin('2').manager.communicators[:winrm]
61
+ require 'kconv'
62
+ require lib_path.join('monkey_patch/azure')
63
+ require lib_path.join('monkey_patch/winrm')
64
+ end
65
+
57
66
  def self.setup_i18n
58
67
  I18n.load_path << File.expand_path(
59
68
  'locales/en.yml',
@@ -6,6 +6,6 @@
6
6
 
7
7
  module VagrantPlugins
8
8
  module WinAzure
9
- VERSION = '1.1.0'
9
+ VERSION = '1.1.1'
10
10
  end
11
11
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-azure
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - MSOpenTech
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-03 00:00:00.000000000 Z
11
+ date: 2015-02-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: azure