Properly poll Openstack metadata + other Openstack improvements #818

tas50 · 2016-05-09T19:33:52Z

The existing Openstack metadata logic failed as it was hardcoded to use metadata from 2013 that doesn't seem to exist in standard installs. Instead lets use the logic in the EC2 metadata mixin to find the latest version we support.
Wrap metadata fetching around socket connection check from the EC2 metadata plugin. This prevents hung Ohai runs on providers that don't support the metadata endpoint
Grab the Openstack data correctly in the Cloud plugins
Detect a system as being on Openstack based on DMI data
Remove HP cloud logic since that's dead
Add debug logging so we can follow what's happening in the logs better

Previously nil data we now have:

 "cloud": {
    "public_ips": [
      "172.16.20.52"
    ],
    "private_ips": [
      "192.168.1.203"
    ],
    "public_ipv4": "172.16.20.52",
    "public_hostname": "ohai.novalocal",
    "local_ipv4": "192.168.1.203",
    "local_hostname": "ohai.novalocal",
    "provider": "openstack"
  },
  "cloud_v2": {
    "public_ipv4_addrs": [
      "172.16.20.52"
    ],
    "local_ipv4_addrs": [
      "192.168.1.203"
    ],
    "provider": "openstack",
    "public_hostname": "ohai.novalocal",
    "local_hostname": "ohai.novalocal",
    "public_ipv4": "172.16.20.52",
    "local_ipv4": "192.168.1.203"
  },
 "openstack": {
    "provider": "openstack",
    "metadata": {
      "ami_id": "ami-00000002",
      "ami_launch_index": "0",
      "ami_manifest_path": "FIXME",
      "block_device_mapping_ami": "vda",
      "block_device_mapping_root": "/dev/vda",
      "hostname": "ohai.novalocal",
      "instance_action": "none",
      "instance_id": "i-00000211",
      "instance_type": "m1.medium",
      "kernel_id": "None",
      "local_hostname": "ohai.novalocal",
      "local_ipv4": "192.168.1.203",
      "placement_availability_zone": "nova",
      "public_hostname": "ohai.novalocal",
      "public_ipv4": "172.16.20.52",
      "public_keys_0_openssh_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxAVkrfknXoHFQtyXtYZ6vONLHn7HTKQq4mkwvCOPMKb3gr6gsLQkCdzmO3CQwOcFl7uDWGdfjH/ocuSUSn6xMvfCdsdGzDiLQXcDJ4jGOuuyOioniN1N00IhAD7Tqsf4AvbQJ7gDqfPKDCw6LdlZ0d0d9pWlJf7eKf/Hq3x8RCqWek/+UCoU4l4T1eAM0N/bA5tj3EfvRuDniO8U5ClsuUbtJ1uxJmrWMhFox3jFp6oNrleHWFTiRsNKfbtfTrTJRYlqcOG2jGAb49JY+p6Ykku4vq0ezYZFYXGJki6a0yLu1kMg5aHJo9UX0d9JW6y11KfXbGKN4okeRcH/tSNov jasghar@remasghar01.local",
      "ramdisk_id": "None",
      "reservation_id": "r-nvo4xzvf",
      "security_groups": [
      ]
    }

The existing Openstack metadata logic failed as it was hardcoded to use metadata from 2013 that doesn't seem to exist in standard installs. Instead lets use the logic in the EC2 metadata mixin to find the latest version we support. Wrap metadata fetching around socket connection check from the EC2 metadata plugin. This prevents hung Ohai runs on providers that don't support the metadata endpoint Grab the Openstack data correctly in the Cloud plugins Detect a system as being on Openstack based on DMI data Remove HP cloud logic since that's dead Add debug logging so we can follow what's happening in the logs better

jjasghar · 2016-05-09T20:17:57Z

🤘 this is awesome sauce.

Test DMI data path, remove openstack specific metadata since we're not gathering this at the moment.

tas50 · 2016-05-09T22:51:50Z

This is ready for review @chef/client-core @mcquin @btm

This makes it easier to write recipes without being super defensive in your code

thommay · 2016-05-10T10:59:26Z

lib/ohai/plugins/openstack.rb

-  def collect_openstack_metadata(addr = Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, api_version = "2013-04-04")
-    path = "/openstack/#{api_version}/meta_data.json"
-    uri = "http://#{addr}#{path}"
+  # dreamhost systems hae the dhc-user on them


thommay · 2016-05-10T11:04:24Z

some tweaks, but 👍

This reverts nesting the attributes in openstack['metadata']. This matches what we do in other clouds

mcquin · 2016-05-10T21:46:21Z

lib/ohai/plugins/cloud.rb

@@ -189,7 +189,7 @@ def get_openstack_values
    cloud[:public_hostname] = openstack["public_hostname"]
    cloud[:local_ipv4] = openstack["local_ipv4"]
    cloud[:local_hostname] = openstack["local_hostname"]
-    cloud[:provider] = openstack["provider"]
+    cloud[:provider] = "openstack"


It looks like this can sometimes be "dreamhost"?

So this one gets a bit weird and here's why I went with openstack. When you're in the context of the cloud plugin says provider you'd think openstack (right? maybe...). When you're in the context of the openstack plugin you know you're openstack so when someone says provider you're thinking about what openstack provider and that could be dreamhost. I guess it could really go either way though.

It could be breaking for some users. Though I understand your argument, I think it's safer to keep it as it was.

The previous behavior was HP or Openstack, but I'll switch this one back. People on Dreamhost can figure it out probably.

mcquin · 2016-05-11T15:12:59Z

👍 🚀 🎉

chef-supermarket added the Signed CLA label May 9, 2016

tas50 mentioned this pull request May 9, 2016

WIP: Properly detect Openstack + fetch metadata #817

Closed

tas50 added the Enhancement label May 9, 2016

tas50 force-pushed the openstack branch from 25f9535 to 5912cc3 Compare May 9, 2016 19:38

chef-supermarket added the Signed CLA label May 9, 2016

Update the specs for the updated plugin

85bc7ec

Test DMI data path, remove openstack specific metadata since we're not gathering this at the moment.

tas50 changed the title ~~WIP: Properly poll Openstack detection + other Openstack improvements~~ Properly poll Openstack detection + other Openstack improvements May 9, 2016

Set metadata to {} not nil if it doesn't respond

be8c7a9

This makes it easier to write recipes without being super defensive in your code

chef-supermarket added the Signed CLA label May 9, 2016

Detect Dreamhost DreamCompute

b18d70f

tas50 force-pushed the openstack branch from 4ce91ca to b18d70f Compare May 10, 2016 00:21

chef-supermarket added the Signed CLA label May 10, 2016

thommay reviewed May 10, 2016
View reviewed changes

tas50 added 2 commits May 10, 2016 09:01

Fix typo in comment

4c9a5b0

Move metadata attributes back to openstack namespace

cbca3e0

This reverts nesting the attributes in openstack['metadata']. This matches what we do in other clouds

mcquin reviewed May 10, 2016
View reviewed changes

tas50 added 2 commits May 10, 2016 15:15

Allow setting dreamhost as the provider in the cloud plugins

7809966

Use the mixin variable for the metadata server

c11de20

tas50 merged commit ab28b87 into master May 11, 2016

tas50 deleted the openstack branch May 11, 2016 15:23

tas50 changed the title ~~Properly poll Openstack detection + other Openstack improvements~~ Properly poll Openstack metadata + other Openstack improvements May 11, 2016

thommay added Type: Enhancement Adds new functionality. and removed Enhancement labels Jan 24, 2017

chef locked and limited conversation to collaborators Nov 16, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Properly poll Openstack metadata + other Openstack improvements #818

Properly poll Openstack metadata + other Openstack improvements #818

tas50 commented May 9, 2016 •

edited

Loading

jjasghar commented May 9, 2016

tas50 commented May 9, 2016

thommay May 10, 2016

tas50 May 10, 2016

thommay commented May 10, 2016

mcquin May 10, 2016

tas50 May 10, 2016

mcquin May 10, 2016

tas50 May 10, 2016

mcquin commented May 11, 2016

Properly poll Openstack metadata + other Openstack improvements #818

Properly poll Openstack metadata + other Openstack improvements #818

Conversation

tas50 commented May 9, 2016 • edited Loading

jjasghar commented May 9, 2016

tas50 commented May 9, 2016

thommay May 10, 2016

Choose a reason for hiding this comment

tas50 May 10, 2016

Choose a reason for hiding this comment

thommay commented May 10, 2016

mcquin May 10, 2016

Choose a reason for hiding this comment

tas50 May 10, 2016

Choose a reason for hiding this comment

mcquin May 10, 2016

Choose a reason for hiding this comment

tas50 May 10, 2016

Choose a reason for hiding this comment

mcquin commented May 11, 2016

tas50 commented May 9, 2016 •

edited

Loading