rubber 1.6.2 → 1.6.3
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +8 -0
- data/VERSION +1 -1
- data/lib/rubber/cloud/aws.rb +2 -1
- data/lib/rubber/recipes/rubber/instances.rb +1 -12
- metadata +4 -4
data/CHANGELOG
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
1.6.2
|
2
|
+
-----
|
3
|
+
|
4
|
+
Fixed rake gems:install issue with Rails 2. <73c47a8> [Kevin Menard]
|
5
|
+
RVM bump. <14b52bc> [Kevin Menard]
|
6
|
+
Use the latest Ubuntu AMIs. <7a15b0d> [Kevin Menard]
|
7
|
+
We shouldn't try to SSH into Windows machines. <f921685> [Kevin Menard]
|
8
|
+
|
1
9
|
1.6.1
|
2
10
|
-----
|
3
11
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.6.
|
1
|
+
1.6.3
|
data/lib/rubber/cloud/aws.rb
CHANGED
@@ -38,8 +38,9 @@ module Rubber
|
|
38
38
|
instance = {}
|
39
39
|
instance[:id] = item.instanceId
|
40
40
|
instance[:external_host] = item.dnsName
|
41
|
-
instance[:external_ip] =
|
41
|
+
instance[:external_ip] = item.ipAddress
|
42
42
|
instance[:internal_host] = item.privateDnsName
|
43
|
+
instance[:internal_ip] = item.privateIpAddress
|
43
44
|
instance[:state] = item.instanceState.name
|
44
45
|
instance[:zone] = item.placement.availabilityZone
|
45
46
|
instance[:platform] = item.platform || 'linux'
|
@@ -239,6 +239,7 @@ namespace :rubber do
|
|
239
239
|
instance_item.external_host = instance[:external_host]
|
240
240
|
instance_item.external_ip = instance[:external_ip]
|
241
241
|
instance_item.internal_host = instance[:internal_host]
|
242
|
+
instance_item.internal_ip = instance[:internal_ip]
|
242
243
|
instance_item.zone = instance[:zone]
|
243
244
|
instance_item.platform = instance[:platform]
|
244
245
|
rubber_instances.save()
|
@@ -270,18 +271,6 @@ namespace :rubber do
|
|
270
271
|
# re-load the roles since we may have just defined new ones
|
271
272
|
load_roles() unless env.disable_auto_roles
|
272
273
|
|
273
|
-
# There's no good way to get the internal IP for a Windows host, so just set it to the external
|
274
|
-
# and let the router handle mapping to the internal network.
|
275
|
-
if instance_item.windows?
|
276
|
-
instance_item.internal_ip = instance_item.external_ip
|
277
|
-
else
|
278
|
-
# Connect to newly created instance and grab its internal ip
|
279
|
-
# so that we can update all aliases
|
280
|
-
direct_connection(instance_item.external_ip) do
|
281
|
-
instance_item.internal_ip = capture(print_ip_command).strip
|
282
|
-
end
|
283
|
-
end
|
284
|
-
|
285
274
|
rubber_instances.save()
|
286
275
|
|
287
276
|
# Add the aliases for this instance to all other hosts
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rubber
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 9
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 6
|
9
|
-
-
|
10
|
-
version: 1.6.
|
9
|
+
- 3
|
10
|
+
version: 1.6.3
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Matt Conway
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-09-
|
18
|
+
date: 2010-09-28 00:00:00 -04:00
|
19
19
|
default_executable: vulcanize
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|