summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | autofixing new chefstyle issueslcg/chefstyleLamont Granquist2017-02-0921-54/+62
|/ / | | | | | | | | | | prep for chefstyle 0.5.0 release to not break master Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Merge pull request #947 from chef/require_configThom May2017-01-271-0/+1
|\ \ | |/ |/| Config is used in system so require it there.
| * Config is used in system so require it there.require_configTim Smith2017-01-261-0/+1
| | | | | | | | | | | | COOL team found this when using ohai/system directly. It worked in 8.X, but not post deprecation of the old config logic. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #949 from chef/dead_codeThom May2017-01-263-11/+0
|\ \ | | | | | | Remove a bit of dead code
| * | Remove a bit of dead codedead_codeTim Smith2017-01-253-11/+0
| | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | Merge pull request #950 from chef/more_minor_specThom May2017-01-261-7/+0
|\ \ \ | |/ / |/| | Remove rescue loading plist in the specs as this is a dep
| * | Remove rescue loading plist in the specs as this is a depmore_minor_specTim Smith2017-01-251-7/+0
|/ / | | | | | | | | | | There’s no need for this and we’re not doing this in the dozen other places we load deps. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #948 from chef/minor_spec_cleanupThom May2017-01-25152-181/+247
|\ \ | |/ |/| Minor spec file cleanup
| * Minor spec file cleanupminor_spec_cleanupTim Smith2017-01-24152-181/+247
|/ | | | | | | | | | | | | - Use require_relative in all the specs vs. expanding on the current file path. - Add missing license headers - Don't silently swallow ipaddr_extensions not being installed. Make it a development dep instead - Remove a rescue on ipaddress as we only do this in one place and it's a required gem - Make the Openstack plugin spec setup the same way as every other spec Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #946 from chef/fix_travisTim Smith2017-01-243-6/+8
|\ | | | | Update travis/appveyer preinstall to resolve rainbow failures
| * Update travis/appveyer preinstallsTim Smith2017-01-243-6/+8
|/ | | | | | Update Rubygems, fully uninstall bundler, install the latest bundler. Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #939 from chef/deprecate_old_configTim Smith2017-01-245-271/+2
|\ | | | | Remove deprecated config logic
| * Remove testing of old config logicdeprecate_old_configTim Smith2017-01-083-183/+0
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Remove deprecated config logicTim Smith2017-01-082-88/+2
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #933 from chef/commandTim Smith2017-01-242-386/+1
|\ \ | | | | | | Remove the deprecated run_command and popen4 methods
View Lorry Controller Status