vagrant-azure 2.0.0.pre8 → 2.0.0
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 +4 -4
- data/.travis.yml +1 -1
- data/README.md +4 -14
- data/lib/vagrant-azure/action/run_instance.rb +3 -0
- data/lib/vagrant-azure/config.rb +13 -0
- data/lib/vagrant-azure/version.rb +1 -1
- data/locales/en.yml +4 -0
- data/templates/arm/resources/network_security_group.json.erb +3 -3
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 64dcc45eb405a18acfc16c9f1dd1b30d0a47af5e
|
4
|
+
data.tar.gz: 398f4be8ca9f0d5147be98ad6c586a49aff91233
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1219b2d4ab73fb84e4e4a7774482d36db591a786ca346af7a3441117f9b62c9aa4f09df7e5567723f5ba11d151d50d53d57d81105cd4497f7873c7b47b210b0b
|
7
|
+
data.tar.gz: d2e50a735ae0a44b52011826580c2ff92fc6f8dadbaa8b4bf6bfe9d3fdbad94da345bcb695e347082b8af2d182e1c6dad167906e289873b7b34f1ea5213e18c1
|
data/.travis.yml
CHANGED
data/README.md
CHANGED
@@ -12,7 +12,7 @@ provider to Vagrant, allowing Vagrant to control and provision machines in Micro
|
|
12
12
|
### Create an Azure Active Directory (AAD) Application
|
13
13
|
AAD encourages the use of Applications / Service Principals for authenticating applications. An
|
14
14
|
application / service principal combination provides a service identity for Vagrant to manage your Azure Subscription.
|
15
|
-
[Click here to learn about AAD applications and service principals.](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects
|
15
|
+
[Click here to learn about AAD applications and service principals.](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
|
16
16
|
- [Install the Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
|
17
17
|
- run `az login` to log into Azure
|
18
18
|
- run `az ad sp create-for-rbac` to create an Azure Active Directory Application with access to Azure Resource Manager
|
@@ -90,7 +90,7 @@ you can ```vagrant up``` and use ```azure``` provider. For example:
|
|
90
90
|
|
91
91
|
```sh
|
92
92
|
$ vagrant box add azure https://github.com/azure/vagrant-azure/raw/v2.0/dummy.box --provider azure
|
93
|
-
|
93
|
+
$ vagrant plugin install vagrant-azure
|
94
94
|
$ vagrant up --provider=azure
|
95
95
|
```
|
96
96
|
|
@@ -137,18 +137,8 @@ override.data_disks = [
|
|
137
137
|
{
|
138
138
|
name: "mydatadisk1",
|
139
139
|
size_gb: 30
|
140
|
-
}
|
141
|
-
|
142
|
-
{
|
143
|
-
name: "mydatadisk2",
|
144
|
-
vhd_uri: "http://mystorage.blob.core.windows.net/vhds/mydatadisk2.vhd"
|
145
|
-
},
|
146
|
-
# sample of attaching a data disk from image
|
147
|
-
{
|
148
|
-
name: "mydatadisk3",
|
149
|
-
vhd_uri: "http://mystorage.blob.core.windows.net/vhds/mydatadisk3.vhd",
|
150
|
-
image: "http: //storagename.blob.core.windows.net/vhds/VMImageName-datadisk.vhd"
|
151
|
-
}]
|
140
|
+
}
|
141
|
+
]
|
152
142
|
```
|
153
143
|
|
154
144
|
### Optional Networking Parameters
|
@@ -40,6 +40,7 @@ module VagrantPlugins
|
|
40
40
|
location = config.location
|
41
41
|
ssh_user_name = machine.config.ssh.username
|
42
42
|
vm_name = config.vm_name
|
43
|
+
vm_storage_account_type = config.vm_storage_account_type
|
43
44
|
vm_size = config.vm_size
|
44
45
|
vm_image_urn = config.vm_image_urn
|
45
46
|
vm_vhd_uri = config.vm_vhd_uri
|
@@ -65,6 +66,7 @@ module VagrantPlugins
|
|
65
66
|
env[:ui].info(" -- SSH User Name: #{ssh_user_name}") if ssh_user_name
|
66
67
|
env[:ui].info(" -- Admin Username: #{admin_user_name}") if admin_user_name
|
67
68
|
env[:ui].info(" -- VM Name: #{vm_name}")
|
69
|
+
env[:ui].info(" -- VM Storage Account Type: #{vm_storage_account_type}")
|
68
70
|
env[:ui].info(" -- VM Size: #{vm_size}")
|
69
71
|
|
70
72
|
if !vm_vhd_uri.nil?
|
@@ -91,6 +93,7 @@ module VagrantPlugins
|
|
91
93
|
dnsLabelPrefix: dns_label_prefix,
|
92
94
|
nsgLabelPrefix: nsg_label_prefix,
|
93
95
|
vmSize: vm_size,
|
96
|
+
storageAccountType: vm_storage_account_type,
|
94
97
|
vmName: vm_name,
|
95
98
|
subnetName: subnet_name,
|
96
99
|
virtualNetworkName: virtual_network_name,
|
data/lib/vagrant-azure/config.rb
CHANGED
@@ -46,6 +46,12 @@ module VagrantPlugins
|
|
46
46
|
attr_accessor :vm_name
|
47
47
|
|
48
48
|
# (Optional) DNS Name prefix of the virtual machine
|
49
|
+
# Uses value of vm_name if not specified.
|
50
|
+
# Note: this must conform to the following regular expression:
|
51
|
+
#
|
52
|
+
# ^[a-z][a-z0-9-]{1,61}[a-z0-9]
|
53
|
+
#
|
54
|
+
# Therefore this field mustbe set if vm_name has capital letters (for ex.)
|
49
55
|
#
|
50
56
|
# @return [String]
|
51
57
|
attr_accessor :dns_name
|
@@ -65,6 +71,11 @@ module VagrantPlugins
|
|
65
71
|
# @return [String]
|
66
72
|
attr_accessor :vm_size
|
67
73
|
|
74
|
+
# (Optional) Storage account type to be used -- defaults to 'Premium_LRS'. Alt value is 'Standard_LRS' See: https://docs.microsoft.com/en-us/azure/storage/storage-about-disks-and-vhds-linux
|
75
|
+
#
|
76
|
+
# @return [String]
|
77
|
+
attr_accessor :vm_storage_account_type
|
78
|
+
|
68
79
|
# (Optional) Name of the virtual machine image URN to use -- defaults to 'canonical:ubuntuserver:16.04.0-DAILY-LTS:latest'. See: https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-ps-findimage/
|
69
80
|
#
|
70
81
|
# @return [String]
|
@@ -193,6 +204,7 @@ module VagrantPlugins
|
|
193
204
|
@nsg_name = UNSET_VALUE
|
194
205
|
@tcp_endpoints = UNSET_VALUE
|
195
206
|
@vm_size = UNSET_VALUE
|
207
|
+
@vm_storage_account_type = UNSET_VALUE
|
196
208
|
@availability_set_name = UNSET_VALUE
|
197
209
|
@instance_ready_timeout = UNSET_VALUE
|
198
210
|
@instance_check_interval = UNSET_VALUE
|
@@ -228,6 +240,7 @@ module VagrantPlugins
|
|
228
240
|
@dns_name = nil if @dns_name == UNSET_VALUE
|
229
241
|
@nsg_name = nil if @nsg_name == UNSET_VALUE
|
230
242
|
@tcp_endpoints = nil if @tcp_endpoints == UNSET_VALUE
|
243
|
+
@vm_storage_account_type = 'Premium_LRS' if @vm_storage_account_type == UNSET_VALUE
|
231
244
|
@availability_set_name = nil if @availability_set_name == UNSET_VALUE
|
232
245
|
|
233
246
|
@instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
|
data/locales/en.yml
CHANGED
@@ -69,6 +69,10 @@ en:
|
|
69
69
|
The Azure instance is not created. Run `vagrant up` to create it.
|
70
70
|
short_stopped: |-
|
71
71
|
stopped
|
72
|
+
short_starting: |-
|
73
|
+
starting
|
74
|
+
short_started: |-
|
75
|
+
started
|
72
76
|
long_stopped: |-
|
73
77
|
The Azure instance is stopped. Run `vagrant up` to start it.
|
74
78
|
short_stopping: |-
|
@@ -56,7 +56,7 @@
|
|
56
56
|
"properties": {
|
57
57
|
"description": "Enable inbound custom ports.",
|
58
58
|
"protocol": "*",
|
59
|
-
"sourcePortRange": "
|
59
|
+
"sourcePortRange": "*",
|
60
60
|
"destinationPortRange": "<%= ports %>",
|
61
61
|
"sourceAddressPrefix": "*",
|
62
62
|
"destinationAddressPrefix": "*",
|
@@ -70,7 +70,7 @@
|
|
70
70
|
"properties": {
|
71
71
|
"description": "Enabled outbound custom ports.",
|
72
72
|
"protocol": "*",
|
73
|
-
"sourcePortRange": "
|
73
|
+
"sourcePortRange": "*",
|
74
74
|
"destinationPortRange": "<%= ports %>",
|
75
75
|
"sourceAddressPrefix": "*",
|
76
76
|
"destinationAddressPrefix": "*",
|
@@ -82,4 +82,4 @@
|
|
82
82
|
<% end %>
|
83
83
|
]
|
84
84
|
}
|
85
|
-
}
|
85
|
+
}
|
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: 2.0.0
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Azure
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-09-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: azure_mgmt_resources
|
@@ -245,12 +245,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
245
245
|
version: '0'
|
246
246
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
247
247
|
requirements:
|
248
|
-
- - "
|
248
|
+
- - ">="
|
249
249
|
- !ruby/object:Gem::Version
|
250
|
-
version:
|
250
|
+
version: '0'
|
251
251
|
requirements: []
|
252
252
|
rubyforge_project:
|
253
|
-
rubygems_version: 2.
|
253
|
+
rubygems_version: 2.6.13
|
254
254
|
signing_key:
|
255
255
|
specification_version: 4
|
256
256
|
summary: Enable Vagrant to manage Windows and Linux machines in Microsoft Azure.
|