Adds more resilient GCE checking #1292
Conversation
|
@nathenharvey you have a slight chefstyle error. If you auto correct it that should get cleared up |
lib/ohai/plugins/gce.rb
Outdated
| # Identifies gce | ||
| # | ||
| # === Return | ||
| # true:: If gce can be identified | ||
| # false:: Otherwise | ||
| def looks_like_gce? | ||
| hint?("gce") || has_gce_metadata? | ||
| hint?("gce") || has_gce_dmi? || has_gce_system_info? || has_gce_metadata? |
There was a problem hiding this comment.
This should probably get refactored to be more like what we're doing in AWS
https://github.com/chef/ohai/blob/master/lib/ohai/plugins/ec2.rb#L108
Then you can just kill off has_gce_metadata?
Also this will make it so that we're only attempting to connect to metadata when we really look like gce. That allows us to switch over to the IP vs. name based URL as well.
There was a problem hiding this comment.
refactored. This will now only attempt to connect to the metadata server when the system info indicates that this node is on GCE. Would you like to switch to IP based GCE_METADATA_ADDR in the same PR?
nathenharvey
force-pushed
the
gce/dmi
branch
from
1f4844d
to
a986add
Compare
Check the system information to determine if this system is running on Google Compute Engine. See also the Google Cloud Documentation for [detecting if you are running in Compute Engine](https://cloud.google.com/compute/docs/instances/managing-instances#dmi). Signed-off-by: Nathen Harvey <nathenharvey@google.com> Update release notes Signed-off-by: Nathen Harvey <nathenharvey@google.com>
nathenharvey
force-pushed
the
gce/dmi
branch
from
a986add
to
ad9bdc7
Compare
|
Looks great. Thanks @nathenharvey |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Description
Check the system information to determine if this system is running on Google Compute Engine.
See also the Google Cloud Documentation for detecting if you are running in Compute Engine.
Check List
Signed-off-by: Nathen Harvey nathenharvey@google.com