vagrant-mos 0.8.49 → 0.8.50
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 -15
- data/lib/vagrant-mos/action/read_ssh_info.rb +2 -1
- data/lib/vagrant-mos/action/run_instance.rb +3 -3
- data/lib/vagrant-mos/config.rb +6 -6
- data/lib/vagrant-mos/errors.rb +3 -3
- data/lib/vagrant-mos/version.rb +1 -1
- data/locales/en.yml +13 -13
- data/spec/vagrant-mos/config_spec.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 04b8d2373b85b50d9162a7e079d880740b313444
|
4
|
+
data.tar.gz: a26f7c0cd4ee0d05e75ffcb71e0d0236c754e161
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 542b11ed583b523ba1dce9bbf436383cf722779ba0f93754974faa1503ca50a57c1e4f28f9a664331b66c80971f8a22345cfc21c8c25fa29b35e02189c965a8f
|
7
|
+
data.tar.gz: a767462abfe8de9950055842191fa0615f30b4c5a5acc4bac7cb5f064993afb14efab6ef06aac4c3a64c37e0ae3c9c61ae598725855629afc90e924cc756440a
|
data/README.md
CHANGED
@@ -134,7 +134,6 @@ This provider exposes quite a few provider-specific configuration options:
|
|
134
134
|
* `use_iam_profile` - If true, will use [IAM profiles](http://docs.mos.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
|
135
135
|
for credentials.
|
136
136
|
* `block_device_mapping` - Amazon EC2 Block Device Mapping Property
|
137
|
-
* `elb` - The ELB name to attach to the instance.
|
138
137
|
|
139
138
|
These can be set like typical provider-specific configuration:
|
140
139
|
|
@@ -247,20 +246,6 @@ Vagrant.configure("2") do |config|
|
|
247
246
|
end
|
248
247
|
```
|
249
248
|
|
250
|
-
### ELB (Elastic Load Balancers)
|
251
|
-
|
252
|
-
You can automatically attach an instance to an ELB during boot and detach on destroy.
|
253
|
-
|
254
|
-
```ruby
|
255
|
-
Vagrant.configure("2") do |config|
|
256
|
-
# ... other stuff
|
257
|
-
|
258
|
-
config.vm.provider "mos" do |mos|
|
259
|
-
mos.elb = "production-web"
|
260
|
-
end
|
261
|
-
end
|
262
|
-
```
|
263
|
-
|
264
249
|
## Development
|
265
250
|
|
266
251
|
To work on the `vagrant-mos` plugin, clone this repository out, and use
|
@@ -41,7 +41,7 @@ module VagrantPlugins
|
|
41
41
|
iam_instance_profile_arn = region_config.iam_instance_profile_arn
|
42
42
|
iam_instance_profile_name = region_config.iam_instance_profile_name
|
43
43
|
monitoring = region_config.monitoring
|
44
|
-
ebs_optimized = region_config.ebs_optimized
|
44
|
+
#ebs_optimized = region_config.ebs_optimized
|
45
45
|
associate_public_ip = region_config.associate_public_ip
|
46
46
|
|
47
47
|
# If there is no keypair then warn the user
|
@@ -72,7 +72,7 @@ module VagrantPlugins
|
|
72
72
|
env[:ui].info(" -- Block Device Mapping: #{block_device_mapping}") if block_device_mapping
|
73
73
|
env[:ui].info(" -- Terminate On Shutdown: #{terminate_on_shutdown}")
|
74
74
|
env[:ui].info(" -- Monitoring: #{monitoring}")
|
75
|
-
env[:ui].info(" -- EBS optimized: #{ebs_optimized}")
|
75
|
+
#env[:ui].info(" -- EBS optimized: #{ebs_optimized}")
|
76
76
|
env[:ui].info(" -- Assigning a public IP address in a VPC: #{associate_public_ip}")
|
77
77
|
|
78
78
|
options = {
|
@@ -89,7 +89,7 @@ module VagrantPlugins
|
|
89
89
|
:block_device_mapping => block_device_mapping,
|
90
90
|
:instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil,
|
91
91
|
:monitoring => monitoring,
|
92
|
-
|
92
|
+
#:ebs_optimized => ebs_optimized,
|
93
93
|
:associate_public_ip => associate_public_ip
|
94
94
|
}
|
95
95
|
if !security_groups.empty?
|
data/lib/vagrant-mos/config.rb
CHANGED
@@ -137,7 +137,7 @@ module VagrantPlugins
|
|
137
137
|
# EBS optimized instance
|
138
138
|
#
|
139
139
|
# @return [Boolean]
|
140
|
-
attr_accessor :ebs_optimized
|
140
|
+
#attr_accessor :ebs_optimized
|
141
141
|
|
142
142
|
# Assigning a public IP address in a VPC
|
143
143
|
#
|
@@ -148,7 +148,7 @@ module VagrantPlugins
|
|
148
148
|
# attached to
|
149
149
|
#
|
150
150
|
# @return [String]
|
151
|
-
attr_accessor :elb
|
151
|
+
#attr_accessor :elb
|
152
152
|
|
153
153
|
def initialize(region_specific=false)
|
154
154
|
@access_key_id = UNSET_VALUE
|
@@ -176,9 +176,9 @@ module VagrantPlugins
|
|
176
176
|
@terminate_on_shutdown = UNSET_VALUE
|
177
177
|
@ssh_host_attribute = UNSET_VALUE
|
178
178
|
@monitoring = UNSET_VALUE
|
179
|
-
|
179
|
+
#@ebs_optimized = UNSET_VALUE
|
180
180
|
@associate_public_ip = UNSET_VALUE
|
181
|
-
|
181
|
+
#@elb = UNSET_VALUE
|
182
182
|
|
183
183
|
# Internal state (prefix with __ so they aren't automatically
|
184
184
|
# merged)
|
@@ -318,13 +318,13 @@ module VagrantPlugins
|
|
318
318
|
@monitoring = false if @monitoring == UNSET_VALUE
|
319
319
|
|
320
320
|
# default false
|
321
|
-
|
321
|
+
#@ebs_optimized = false if @ebs_optimized == UNSET_VALUE
|
322
322
|
|
323
323
|
# default false
|
324
324
|
@associate_public_ip = false if @associate_public_ip == UNSET_VALUE
|
325
325
|
|
326
326
|
# Don't attach instance to any ELB by default
|
327
|
-
|
327
|
+
#@elb = nil if @elb == UNSET_VALUE
|
328
328
|
|
329
329
|
# Compile our region specific configurations only within
|
330
330
|
# NON-REGION-SPECIFIC configurations.
|
data/lib/vagrant-mos/errors.rb
CHANGED
@@ -35,9 +35,9 @@ module VagrantPlugins
|
|
35
35
|
error_key(:mkdir_error)
|
36
36
|
end
|
37
37
|
|
38
|
-
class ElbDoesNotExistError < VagrantMOSError
|
39
|
-
|
40
|
-
end
|
38
|
+
#class ElbDoesNotExistError < VagrantMOSError
|
39
|
+
# error_key("elb_does_not_exist")
|
40
|
+
#end
|
41
41
|
end
|
42
42
|
end
|
43
43
|
end
|
data/lib/vagrant-mos/version.rb
CHANGED
data/locales/en.yml
CHANGED
@@ -4,17 +4,17 @@ en:
|
|
4
4
|
The machine is already %{status}.
|
5
5
|
burning_ami: |-
|
6
6
|
Waiting for the AMI '%{ami_id}' to burn...
|
7
|
-
elb:
|
8
|
-
adjusting: |-
|
9
|
-
Adjusting availability zones of ELB %{elb_name}...
|
10
|
-
registering: |-
|
11
|
-
Registering %{instance_id} at ELB %{elb_name}...
|
12
|
-
deregistering: |-
|
13
|
-
Deregistering %{instance_id} from ELB %{elb_name}...
|
14
|
-
ok: |-
|
15
|
-
ok
|
16
|
-
skipped: |-
|
17
|
-
skipped
|
7
|
+
# elb:
|
8
|
+
# adjusting: |-
|
9
|
+
# Adjusting availability zones of ELB %{elb_name}...
|
10
|
+
# registering: |-
|
11
|
+
# Registering %{instance_id} at ELB %{elb_name}...
|
12
|
+
# deregistering: |-
|
13
|
+
# Deregistering %{instance_id} from ELB %{elb_name}...
|
14
|
+
# ok: |-
|
15
|
+
# ok
|
16
|
+
# skipped: |-
|
17
|
+
# skipped
|
18
18
|
|
19
19
|
launching_instance: |-
|
20
20
|
Launching an instance with the following settings...
|
@@ -115,8 +115,8 @@ en:
|
|
115
115
|
|
116
116
|
Host path: %{hostpath}
|
117
117
|
Error: %{err}
|
118
|
-
elb_does_not_exist: |-
|
119
|
-
ELB configured for the instance does not exist
|
118
|
+
# elb_does_not_exist: |-
|
119
|
+
# ELB configured for the instance does not exist
|
120
120
|
|
121
121
|
states:
|
122
122
|
short_not_created: |-
|
@@ -38,7 +38,7 @@ describe VagrantPlugins::MOS::Config do
|
|
38
38
|
its("terminate_on_shutdown") { should == false }
|
39
39
|
its("ssh_host_attribute") { should be_nil }
|
40
40
|
its("monitoring") { should == false }
|
41
|
-
its("ebs_optimized") { should == false }
|
41
|
+
#its("ebs_optimized") { should == false }
|
42
42
|
its("associate_public_ip") { should == false }
|
43
43
|
end
|
44
44
|
|
@@ -49,7 +49,7 @@ describe VagrantPlugins::MOS::Config do
|
|
49
49
|
# and asserts the proper result comes back out.
|
50
50
|
[:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
|
51
51
|
:instance_package_timeout, :instance_type, :keypair_name, :ssh_host_attribute,
|
52
|
-
:
|
52
|
+
:region, :secret_access_key, :secret_access_url, :monitoring,
|
53
53
|
:associate_public_ip, :subnet_id, :tags, :terminate_on_shutdown,
|
54
54
|
:iam_instance_profile_arn, :iam_instance_profile_name,
|
55
55
|
:use_iam_profile, :user_data, :block_device_mapping].each do |attribute|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-mos
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.50
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- yangcs2009
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-01-
|
11
|
+
date: 2015-01-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fog
|