Skip to content

Commit d22a4e3

Browse files
committed
Adding ohai hints, replaces #102
1 parent 4e59c07 commit d22a4e3

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.cane

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
--abc-max 20
1+
--abc-max 30
22
--style-measure 100

lib/kitchen/driver/ec2.rb

+10-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
require "retryable"
2323
require "kitchen"
2424
require "kitchen/driver/ec2_version"
25+
require "kitchen/ec2/iam_credentials_fetcher"
2526

2627
module Kitchen
2728

@@ -191,6 +192,7 @@ def create(state) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
191192
info("EC2 instance <#{state[:server_id]}> ready.")
192193
state[:hostname] = hostname(server)
193194
instance.transport.connection(state).wait_until_ready
195+
create_ec2_json(state)
194196
debug("ec2:create '#{state[:hostname]}'")
195197
end
196198

@@ -240,13 +242,13 @@ def default_aws_session_token
240242
env
241243
end
242244

243-
def iam_credentials_fetcher
245+
def fetcher
244246
@fetcher ||= Kitchen::EC2::IamCredentialsFetcher.new(logger)
245247
end
246248

247249
# Simple delegate to the iam credentials fetcher
248250
def iam_creds
249-
@fetcher.iam_creds
251+
fetcher.iam_creds
250252
end
251253

252254
private
@@ -489,6 +491,12 @@ def wait_for(&block)
489491
)
490492
end
491493

494+
def create_ec2_json(state)
495+
instance.transport.connection(state).execute(
496+
"sudo mkdir -p /etc/chef/ohai/hints;sudo touch /etc/chef/ohai/hints/ec2.json"
497+
)
498+
end
499+
492500
end
493501
end
494502
end

0 commit comments

Comments
 (0)