fog 0.2.24 → 0.2.25
Sign up to get free protection for your applications and to get access to all the features.
- data/fog.gemspec +2 -2
- data/lib/fog.rb +1 -1
- data/lib/fog/aws/models/ec2/server.rb +4 -4
- metadata +3 -3
data/fog.gemspec
CHANGED
@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
|
|
7
7
|
## If your rubyforge_project name is different, then edit it and comment out
|
8
8
|
## the sub! line in the Rakefile
|
9
9
|
s.name = 'fog'
|
10
|
-
s.version = '0.2.
|
11
|
-
s.date = '2010-08-
|
10
|
+
s.version = '0.2.25'
|
11
|
+
s.date = '2010-08-18'
|
12
12
|
s.rubyforge_project = 'fog'
|
13
13
|
|
14
14
|
## Make sure your summary is short. The description may be as long
|
data/lib/fog.rb
CHANGED
@@ -33,7 +33,7 @@ module Fog
|
|
33
33
|
attribute :user_data
|
34
34
|
|
35
35
|
def initialize(attributes={})
|
36
|
-
@groups ||= ["default"]
|
36
|
+
@groups ||= ["default"] unless attributes[:subnet_id]
|
37
37
|
@flavor_id ||= 'm1.small'
|
38
38
|
super
|
39
39
|
end
|
@@ -132,10 +132,10 @@ module Fog
|
|
132
132
|
# If subnet is defined we are working on a virtual private cloud.
|
133
133
|
# subnet & security group cannot co-exist. I wish VPC just ignored
|
134
134
|
# the security group parameter instead, it would be much easier!
|
135
|
-
if subnet_id
|
136
|
-
options.delete('SubnetId')
|
137
|
-
else
|
135
|
+
if subnet_id
|
138
136
|
options.delete('SecurityGroup')
|
137
|
+
else
|
138
|
+
options.delete('SubnetId')
|
139
139
|
end
|
140
140
|
|
141
141
|
data = connection.run_instances(@image_id, 1, 1, options)
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 2
|
8
|
-
-
|
9
|
-
version: 0.2.
|
8
|
+
- 25
|
9
|
+
version: 0.2.25
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- geemus (Wesley Beary)
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-08-
|
17
|
+
date: 2010-08-18 00:00:00 -07:00
|
18
18
|
default_executable: fog
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|