Commit 2954f3c 1 parent e7f840f commit 2954f3c Copy full SHA for 2954f3c
File tree 1 file changed +12
-3
lines changed
1 file changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -94,7 +94,8 @@ def create(state)
94
94
server . wait_for do
95
95
print '.'
96
96
# Euca instances often report ready before they have an IP
97
- ready? && !public_ip_address . nil? && public_ip_address != '0.0.0.0'
97
+ ipaddress = Kitchen ::Driver ::Ec2 . hostname ( self )
98
+ ready? && !ipaddress . nil? && ipaddress != '0.0.0.0'
98
99
end
99
100
print '(server ready)'
100
101
state [ :hostname ] = hostname ( server )
@@ -219,10 +220,18 @@ def interface_types
219
220
220
221
def hostname ( server )
221
222
if config [ :interface ]
222
- method = interface_types . fetch ( config [ :interface ] ) do
223
+ interface_type = interface_types . fetch ( config [ :interface ] ) do
223
224
raise Kitchen ::UserError , 'Invalid interface'
224
225
end
225
- server . send ( method )
226
+ Kitchen ::Driver ::Ec2 . hostname ( server , interface_type )
227
+ else
228
+ Kitchen ::Driver ::Ec2 . hostname ( server )
229
+ end
230
+ end
231
+
232
+ def self . hostname ( server , interface_type = nil )
233
+ if interface_type
234
+ server . send ( interface_type )
226
235
else
227
236
server . dns_name || server . public_ip_address || server . private_ip_address
228
237
end
You can’t perform that action at this time.
0 commit comments