cloud-maker 0.6.0 → 0.6.1
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.
- data/lib/cloud_maker/config.rb +1 -1
- data/lib/cloud_maker/ec2.rb +10 -1
- metadata +1 -1
data/lib/cloud_maker/config.rb
CHANGED
@@ -288,7 +288,7 @@ module CloudMaker
|
|
288
288
|
instance_config_yaml = File.expand_path(instance_config_yaml)
|
289
289
|
cloud_yaml = File.open(instance_config_yaml, "r") #Right_AWS will base64 encode this for us
|
290
290
|
rescue
|
291
|
-
raise FileContentNotFound.new("Unable to access the configuration via your local file system from #{
|
291
|
+
raise FileContentNotFound.new("Unable to access the configuration via your local file system from #{instance_config_yaml}.", instance_config_yaml)
|
292
292
|
end
|
293
293
|
end
|
294
294
|
|
data/lib/cloud_maker/ec2.rb
CHANGED
@@ -117,7 +117,16 @@ module CloudMaker
|
|
117
117
|
:user_data => user_data
|
118
118
|
)
|
119
119
|
|
120
|
-
|
120
|
+
begin
|
121
|
+
instance.tags.set(cloud_maker_config['tags']) if cloud_maker_config['tags']
|
122
|
+
rescue AWS::EC2::Errors::InvalidInstanceID::NotFound => e
|
123
|
+
retries ||= 0
|
124
|
+
if retries < 5
|
125
|
+
sleep(2**retries)
|
126
|
+
retries += 1
|
127
|
+
retry
|
128
|
+
end
|
129
|
+
end
|
121
130
|
|
122
131
|
if cloud_maker_config.elastic_ip? || cloud_maker_config.cname?
|
123
132
|
while instance.status == :pending
|