vagrant-mos 0.8.60 → 0.8.70
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/README.md +0 -6
- data/lib/vagrant-mos/action/run_instance.rb +6 -6
- data/lib/vagrant-mos/config.rb +6 -6
- data/lib/vagrant-mos/version.rb +1 -1
- data/spec/vagrant-mos/config_spec.rb +7 -9
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3e484a4ec0d43ecd5c56e251a5618c03788614b0
|
|
4
|
+
data.tar.gz: 2d151cfc04d65225b462f8927ba8beac2b1c5098
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 85b0d1f1fdaf9bfa0208ad3c057e2945baf5c38560be54cd5f0dd3ea12bf778ec4728d9f17349cd854d0c8ee919db644d1a4d92d61de2c1b9e2955d816764a0b
|
|
7
|
+
data.tar.gz: 3db18e6147b47403f1bdc9d490f60e2b17250d2544e2580f280fb98530580a242b2bc388132f7709f6e93ab50f04b3c53e04313bf35f74b59452fefba3c211d1
|
data/README.md
CHANGED
|
@@ -112,12 +112,6 @@ This provider exposes quite a few provider-specific configuration options:
|
|
|
112
112
|
* `secret_access_url` - The accee url for accessing MOS
|
|
113
113
|
* `region` - The region to start the instance in, such as "us-east-1"
|
|
114
114
|
* `secret_access_key` - The secret access key for accessing MOS
|
|
115
|
-
* `iam_instance_profile_arn` - The Amazon resource name (ARN) of the IAM Instance
|
|
116
|
-
Profile to associate with the instance
|
|
117
|
-
* `iam_instance_profile_name` - The name of the IAM Instance Profile to associate
|
|
118
|
-
with the instance
|
|
119
|
-
* `associate_public_ip` - If true, will associate a public IP address to an instance in a VPC.
|
|
120
|
-
* `tags` - A hash of tags to set on the machine.
|
|
121
115
|
* `use_iam_profile` - If true, will use [IAM profiles](http://docs.mos.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
|
|
122
116
|
for credentials.
|
|
123
117
|
|
|
@@ -38,8 +38,8 @@ module VagrantPlugins
|
|
|
38
38
|
#block_device_mapping = region_config.block_device_mapping
|
|
39
39
|
#elastic_ip = region_config.elastic_ip
|
|
40
40
|
terminate_on_shutdown = region_config.terminate_on_shutdown
|
|
41
|
-
iam_instance_profile_arn = region_config.iam_instance_profile_arn
|
|
42
|
-
iam_instance_profile_name = region_config.iam_instance_profile_name
|
|
41
|
+
#iam_instance_profile_arn = region_config.iam_instance_profile_arn
|
|
42
|
+
#iam_instance_profile_name = region_config.iam_instance_profile_name
|
|
43
43
|
#monitoring = region_config.monitoring
|
|
44
44
|
#ebs_optimized = region_config.ebs_optimized
|
|
45
45
|
#associate_public_ip = region_config.associate_public_ip
|
|
@@ -57,8 +57,8 @@ module VagrantPlugins
|
|
|
57
57
|
#env[:ui].info(" -- Availability Zone: #{availability_zone}") if availability_zone
|
|
58
58
|
env[:ui].info(" -- Keypair: #{keypair}") if keypair
|
|
59
59
|
#env[:ui].info(" -- Subnet ID: #{subnet_id}") if subnet_id
|
|
60
|
-
env[:ui].info(" -- IAM Instance Profile ARN: #{iam_instance_profile_arn}") if iam_instance_profile_arn
|
|
61
|
-
env[:ui].info(" -- IAM Instance Profile Name: #{iam_instance_profile_name}") if iam_instance_profile_name
|
|
60
|
+
#env[:ui].info(" -- IAM Instance Profile ARN: #{iam_instance_profile_arn}") if iam_instance_profile_arn
|
|
61
|
+
#env[:ui].info(" -- IAM Instance Profile Name: #{iam_instance_profile_name}") if iam_instance_profile_name
|
|
62
62
|
#env[:ui].info(" -- Private IP: #{private_ip_address}") if private_ip_address
|
|
63
63
|
#env[:ui].info(" -- User Data: yes") if user_data
|
|
64
64
|
#env[:ui].info(" -- Security Groups: #{security_groups.inspect}") if !security_groups.empty?
|
|
@@ -75,8 +75,8 @@ module VagrantPlugins
|
|
|
75
75
|
:key_name => keypair,
|
|
76
76
|
#:private_ip_address => private_ip_address,
|
|
77
77
|
#:subnet_id => subnet_id,
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
#:iam_instance_profile_arn => iam_instance_profile_arn,
|
|
79
|
+
#:iam_instance_profile_name => iam_instance_profile_name,
|
|
80
80
|
#:tags => tags,
|
|
81
81
|
#:user_data => user_data,
|
|
82
82
|
#:block_device_mapping => block_device_mapping,
|
data/lib/vagrant-mos/config.rb
CHANGED
|
@@ -80,13 +80,13 @@ module VagrantPlugins
|
|
|
80
80
|
# to associate with the instance.
|
|
81
81
|
#
|
|
82
82
|
# @return [String]
|
|
83
|
-
attr_accessor :iam_instance_profile_arn
|
|
83
|
+
#attr_accessor :iam_instance_profile_arn
|
|
84
84
|
|
|
85
85
|
# The name of the IAM Instance Profile to associate with
|
|
86
86
|
# the instance.
|
|
87
87
|
#
|
|
88
88
|
# @return [String]
|
|
89
|
-
attr_accessor :iam_instance_profile_name
|
|
89
|
+
#attr_accessor :iam_instance_profile_name
|
|
90
90
|
|
|
91
91
|
# The subnet ID to launch the machine into (VPC).
|
|
92
92
|
#
|
|
@@ -171,8 +171,8 @@ module VagrantPlugins
|
|
|
171
171
|
@use_iam_profile = UNSET_VALUE
|
|
172
172
|
#@block_device_mapping = []
|
|
173
173
|
#@elastic_ip = UNSET_VALUE
|
|
174
|
-
|
|
175
|
-
|
|
174
|
+
#@iam_instance_profile_arn = UNSET_VALUE
|
|
175
|
+
#@iam_instance_profile_name = UNSET_VALUE
|
|
176
176
|
@terminate_on_shutdown = UNSET_VALUE
|
|
177
177
|
@ssh_host_attribute = UNSET_VALUE
|
|
178
178
|
#@monitoring = UNSET_VALUE
|
|
@@ -299,8 +299,8 @@ module VagrantPlugins
|
|
|
299
299
|
#@subnet_id = nil if @subnet_id == UNSET_VALUE
|
|
300
300
|
|
|
301
301
|
# IAM Instance profile arn/name is nil by default.
|
|
302
|
-
|
|
303
|
-
|
|
302
|
+
#@iam_instance_profile_arn = nil if @iam_instance_profile_arn == UNSET_VALUE
|
|
303
|
+
#@iam_instance_profile_name = nil if @iam_instance_profile_name == UNSET_VALUE
|
|
304
304
|
|
|
305
305
|
# By default we don't use an IAM profile
|
|
306
306
|
@use_iam_profile = false if @use_iam_profile == UNSET_VALUE
|
data/lib/vagrant-mos/version.rb
CHANGED
|
@@ -22,14 +22,14 @@ describe VagrantPlugins::MOS::Config do
|
|
|
22
22
|
#its("instance_package_timeout") { should == 600 }
|
|
23
23
|
its("instance_type") { should == "C1_M2" }
|
|
24
24
|
its("keypair_name") { should be_nil }
|
|
25
|
-
its("private_ip_address") { should be_nil }
|
|
25
|
+
#its("private_ip_address") { should be_nil }
|
|
26
26
|
its("region") { should == "us-east-1" }
|
|
27
27
|
its("secret_access_key") { should be_nil }
|
|
28
28
|
its("secret_access_url") { should be_nil }
|
|
29
|
-
its("security_groups") { should == [] }
|
|
30
|
-
its("subnet_id") { should be_nil }
|
|
31
|
-
its("iam_instance_profile_arn") { should be_nil }
|
|
32
|
-
its("iam_instance_profile_name") { should be_nil }
|
|
29
|
+
#its("security_groups") { should == [] }
|
|
30
|
+
#its("subnet_id") { should be_nil }
|
|
31
|
+
#its("iam_instance_profile_arn") { should be_nil }
|
|
32
|
+
#its("iam_instance_profile_name") { should be_nil }
|
|
33
33
|
#its("tags") { should == {} }
|
|
34
34
|
#its("user_data") { should be_nil }
|
|
35
35
|
its("use_iam_profile") { should be_false }
|
|
@@ -49,10 +49,8 @@ describe VagrantPlugins::MOS::Config do
|
|
|
49
49
|
# and asserts the proper result comes back out.
|
|
50
50
|
[:access_key_id, :ami, :instance_ready_timeout,
|
|
51
51
|
:instance_type, :keypair_name, :ssh_host_attribute,
|
|
52
|
-
:region, :secret_access_key, :secret_access_url, :
|
|
53
|
-
:
|
|
54
|
-
:iam_instance_profile_arn, :iam_instance_profile_name,
|
|
55
|
-
:use_iam_profile, :user_data, :block_device_mapping].each do |attribute|
|
|
52
|
+
:region, :secret_access_key, :secret_access_url, :terminate_on_shutdown,
|
|
53
|
+
:use_iam_profile].each do |attribute|
|
|
56
54
|
|
|
57
55
|
it "should not default #{attribute} if overridden" do
|
|
58
56
|
instance.send("#{attribute}=".to_sym, "foo")
|