summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fully rename the cloud_v2 plugin to cloudcloud_v2_v2Tim Smith2017-04-032-45/+45
| | | | | | This is necessary is someone wants to disable the plugin. They shouldn’t have to use the old name that we’ll be killing off with Chef 14. Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #973 from chef/cloud_v_no_moreTim Smith2017-04-034-615/+15
|\ | | | | Replace the cloud plugin with the cloud_v2 plugin
| * Improve the cloud vs. cloudv2 comparisoncloud_v_no_moreTim Smith2017-04-031-2/+1
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Add basic check that both attributes are populatedTim Smith2017-04-031-0/+12
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Replace the cloud plugin with the cloud_v2 pluginTim Smith2017-04-034-615/+4
| | | | | | | | | | | | Simply set the cloud_v2 plugin to to write to both namespaces Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #976 from chef/timeoutsTim Smith2017-04-032-3/+3
|\ \ | | | | | | Shorten the sbt shellout timeout period
| * | Fix specs for the timeouttimeoutsTim Smith2017-04-031-2/+2
| | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | Shorten the sbt shellout timeout periodTim Smith2017-04-031-1/+1
|/ / | | | | | | | | | | 30 seconds is way too high here. On my mac the sbt command fails (a whole different issue), but we take 30 seconds to skip the plugin. There’s no reason to wait 30 seconds here for a plugin that doesn’t need that. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #967 from chef/do_cloud_fixTim Smith2017-04-034-54/+80
|\ \ | |/ | | Fix the cloud plugins to properly report values on DO
| * Don’t use sendTim Smith2017-04-031-4/+4
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Fix the cloud plugins to properly report values on DOdo_cloud_fixTim Smith2017-03-224-54/+80
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #972 from coderanger/freeze-stringsNoah Kantrowitz2017-04-032-0/+27
|\ \ | | | | | | Freeze all string values coming out of Ohai.
| * | Make Rubocop happy.Noah Kantrowitz2017-04-031-2/+2
| | | | | | | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
| * | Freeze all string values coming out of Ohai.Noah Kantrowitz2017-04-032-0/+27
| | | | | | | | | | | | | | | | | | | | | This both helps avoid weird mutation bugs and saves a bit of RAM. Refs https://github.com/chef/chef/issues/4930 Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
* | | Merge pull request #971 from chef/lcg/amazon-platform-familyLamont Granquist2017-04-032-5/+7
|\ \ \ | |/ / |/| | add amazon platform_family
| * | add amazon platform_familylcg/amazon-platform-familyLamont Granquist2017-04-012-5/+7
|/ / | | | | | | | | | | | | | | | | | | | | i think we've finally decided not to move amazon to fedora in #960 i still think everyone is wrong, but i got my `fedora_derived?` chef-sugar helper so its a mute point now... https://github.com/chef/chef-rfc/pull/252 Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Merge pull request #969 from chef/dmi_typesTim Smith2017-03-281-0/+3
|\ \ | | | | | | Add DMI type 40,41, and 42 from the latest man page
| * | Add DMI type 40,41, and 42 from the latest man pageTim Smith2017-03-281-0/+3
| |/ | | | | | | | | | | These have been added in the last few years it appears Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #964 from webframp/ec2/region-and-zoneTim Smith2017-03-212-0/+45
|\ \ | |/ |/| [ec2] Add additional data from identity document
| * [ec2] Add additional data from identity documentSean Escriva2017-03-172-0/+45
|/ | | | | | | Since it's already fetching the identity document to retrieve the account id, this adds the region and AZ info in the same place. Signed-off-by: Sean Escriva <sean.escriva@gmail.com>
* Merge pull request #958 from chef/luaTim Smith2017-03-092-3/+11
|\ | | | | Fix lua detection on new versions of lua
| * Fix lua detection on new versions of lualuaTim Smith2017-03-012-3/+11
| | | | | | | | | | | | | | | | Newer versions of lua output lua -v on stdout while older versions use stderr. This update will handle both and ensure that we continue to detect the installed lua version. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #959 from chef/scalaTim Smith2017-03-091-2/+3
|\ \ | | | | | | Fix scala detection when version output contains a warning
| * | Properly detect scalascalaTim Smith2017-03-011-2/+3
| |/ | | | | | | | | | | It seems that sometimes scala outputs a bogus line ahead out the version output. Use a match instead of a split to better handle this sort of thing. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #961 from chef/lcg/kinda-hate-github-changelog-generatorLamont Granquist2017-03-031-8/+11
|\ \ | |/ |/| rescue github-changelog-generator in Rakefile
| * rescue github-changelog-generator in RakefileLamont Granquist2017-03-031-8/+11
| | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Merge pull request #957 from chef/chefstyleTim Smith2017-03-011-1/+1
|\ \ | |/ | | Fix a chefstyle warning
| * Fix a chefstyle warningTim Smith2017-03-011-1/+1
|/ | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #823 from chef/GenPage-digitalocean_metadataTim Smith2017-03-015-172/+147
|\ | | | | Add Digital Ocean metadata from their metadata API
| * Use the new http helper for socket checksGenPage-digitalocean_metadataTim Smith2017-02-232-31/+4
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Fix bad rebaseTim Smith2017-02-231-131/+35
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Update cloud plugin to parse new digital_ocean dataTim Smith2017-02-232-19/+36
| | | | | | | | Signed-off-by: Tim Smith <tsmith84@gmail.com>
| * Add spec for digital ocean DMI data flowTim Smith2017-02-232-1/+9
| |
| * Log consistencyTim Smith2017-02-231-3/+3
| |
| * Exclude vendor data and don't depend on the network pluginTim Smith2017-02-231-1/+1
| | | | | | | | | | | | The network plugin is leftover from the old method where we looked up the interfaces based on the IP in the hint. We don't do that anymore so this isn't necessary. Vendor data can include sensitive bootstrapping information that we shouldn't save to the node. It also doesn't include anything of value so either way the data shouldn't be on the node
| * Parse the JSON so that we can do .each on it laterTim Smith2017-02-231-5/+6
| | | | | | | | Without this it's just a big string and the .each fails
| * Detect DigitalOcean via DMI dataTim Smith2017-02-231-14/+14
| | | | | | | | The cloud data on the droplet I spun up didn't have the string listed and it also required disk reads / yaml to be loaded. This should be a lot faster since we're grabbing this data anyways.
| * Use the correct IP address for metadataTim Smith2017-02-231-1/+1
| |
| * Match the format of the other loggersTim Smith2017-02-231-2/+2
| |
| * Chefstyle fixes and fix a bad hashTim Smith2017-02-232-9/+9
| | | | | | | | : vs. => was killing the spec
| * Remove debug code/add proper has_do_init check. Attempt to fix failing testsGenPage2017-02-232-3/+21
| |
| * Setup DigitalOcean plugin to use Metadata APIGenPage2017-02-232-41/+95
| |
* | Merge pull request #955 from chef/lcg/fix-loggerTim Smith2017-02-284-19/+29
|\ \ | | | | | | fix logger issues
| * | refactor to use the config flag because the initalizer is awfullcg/fix-loggerLamont Granquist2017-02-283-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby doesn't like optional hashes combined with optional named parameters -- because hashes and kwargs get magically converted and ruby gets confused. plus fixed/added specs Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * | add some comments to the codeLamont Granquist2017-02-272-0/+6
| | | | | | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * | fix ohai logger problems.Lamont Granquist2017-02-273-5/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i believe this gets the logic correct in that we want to configure the logger when we're coming from the command line but want to skip it when we're coming from chef or from other APIs that directly construct an Ohai::System object. i suspect this is what thom was trying to do by moving the Ohai::Log.init call into the Ohai::Application class (which avoids it being called entirely when Chef creates its Ohai::System object) here: https://github.com/chef/ohai/pull/942/files but that change broke the behavior where we were also supposed to skip the rest of the configure_logging method in Ohai::System when run under chef client. I tried going down the route of having the Ohai::Application class construct the Ohai::System object and then having it be the responsibility of that caller to do configure_logging work. However, I suspect that the initializer in Ohai::System does way too much and that the purpose of configuring the logger where it is, is that it must be initialized in the middle of object creation before it goes on and creates the Loader, the Runner, creates Hints and removes constants. So, I went the route of threading a flag through the initializer so that Ohai::System can know if its coming from the cli or not and behave appropriately. There's also quite a mess with the Ohai::Log class being passed around to the workstation loader, and it initializes itself at class loading time and Chef::Application will inject state into Ohai::Log. I think the eager initialization at class loading time is to not lose early messages when run from the cli, but it means the Ohai::Log object is always initialized, so that isn't useful for determining if we have come from the cli or not. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | bump ohai version to 13.0.0 for chef-13 developmentLamont Granquist2017-02-231-2/+2
|/ | | | | | | this probably should have been done on master earlier since breaking changes already went into ohai master Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Merge pull request #951 from chef/http_helperTim Smith2017-02-105-62/+62
|\ | | | | Move duplicate http logic into a helper
| * Move duplicate http logic into a helperhttp_helperTim Smith2017-02-035-62/+62
| | | | | | | | | | | | We probably want to use this in a few other places, but we certainly want to encourage people to use this in their plugins vs. reinventing the wheel. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #954 from chef/lcg/chefstyleLamont Granquist2017-02-0921-54/+62
|\ \ | | | | | | autofixing new chefstyle issues
View Lorry Controller Status