summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add some yard docsCHEF-8432/fix-default-protocolMarc A. Paradise2019-05-021-9/+73
| | | | Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Require 'net/ssh' before we reference it.Marc A. Paradise2019-05-022-5/+10
| | | | | | | | | This also updates bootstrap to provide `non_interactive` as an option to TrainConnector, instead of TrainConnector setting it behind the scenes. Bootstrap uses non-interactive to ensure that we don't get net/ssh prompts for password in case of password failure. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Ensure that requested protocol is available and correctMarc A. Paradise2019-05-022-51/+104
| | | | | | | | | | | | | | | | There are a few related changes here: * ensure that we always have the requested protocol, and use the default when we can't otherwise resolve it. This corrects the first part of CHEF-8432 * This also finishes the work started in a previous branch that moves the config handling out of TrainConnector::initialize and into a lazy loader for config. * Ensure that the baseline configuration contains only things that will not be picked up when merging user-provided config. This meant moving :non_interactive out to the caller (bootstrap). * Removed helpers that weren't helping much. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Remove testing method TrainConnector#test_instanceMarc A. Paradise2019-05-022-33/+17
| | | | | | This can live in the tests. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Bump version to 15.0.253 by Chef Expeditorv15.0.253Chef Expeditor2019-05-025-11/+11
| | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8450 from chef/lcg/update-ci-verifyLamont Granquist2019-05-012-13/+3
|\ | | | | update the ci verify tasks for chef-15
| * update the ci verify tasks for chef-15lcg/update-ci-verifyLamont Granquist2019-05-012-13/+3
|/ | | | | | | | | | | | we need to bundle install now in both places (ChefDK style of appbundling means there is no Gemfile.lock here and we do the install against the somewhat novel-looking Gemfile that kinda looks like Gemfile.lock). and on windows side since there is no Gemfile.lock any more we need to avoid that test. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Bump version to 15.0.252 by Chef Expeditorv15.0.252Chef Expeditor2019-05-025-11/+11
| | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8449 from chef/lcg/chefstyle-groupLamont Granquist2019-05-012-1/+3
|\ | | | | add a group for chefstyle so it can be excluded
| * bump omnibus-softwareLamont Granquist2019-05-011-1/+1
| | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * add a group for chefstyle so it can be excludedlcg/chefstyle-groupLamont Granquist2019-05-011-0/+2
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Merge pull request #8447 from chef/remove_poiseTim Smith2019-05-011-8/+0
|\ | | | | Remove poise halite testing from Travis
| * Remove poise halite testing from TravisTim Smith2019-05-011-8/+0
| | | | | | | | | | | | | | | | We're not going to see a release of halite that works with modern Chef releases. We're just consuming a slot of Travis for this to fail each run. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Bump version to 15.0.251 by Chef Expeditorv15.0.251Chef Expeditor2019-05-016-14/+15
|/ | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8446 from chef/new_rubyTim Smith2019-05-013-25/+25
|\ | | | | Update to Ruby 2.6.3
| * Update to Ruby 2.6.3Tim Smith2019-05-013-25/+25
| | | | | | | | | | | | This includes a few minor bugfixes and support for the new Japanese calendar. I also further pruned the gem groups to match the current ones in our Gemfile. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Bump version to 15.0.250 by Chef Expeditorv15.0.250Chef Expeditor2019-05-016-14/+15
|/ | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8445 from chef/nuke_old_gemsTim Smith2019-05-016-40/+23
|\ | | | | Remove old maintainer gems from the Gemfile
| * Update gemfile.lockTim Smith2019-05-012-18/+9
| | | | | | | | | | | | Bring in all the latest and greatest Signed-off-by: Tim Smith <tsmith@chef.io>
| * Remove old maintainer gems from the Gemfilenuke_old_gemsTim Smith2019-05-014-22/+14
|/ | | | | | These were used by our maintainer rake tasks. These are all gone now so there's no need for these gems. Signed-off-by: Tim Smith <tsmith@chef.io>
* Bump version to 15.0.249 by Chef Expeditorv15.0.249Chef Expeditor2019-05-016-14/+15
| | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8429 from chef/mp/bootstrap-deprecation-fixesTim Smith2019-05-012-49/+43
|\ | | | | [CHEF-8422] Fix incorrect deprecation warnings
| * Fix incorrect deprecation warningsmp/bootstrap-deprecation-fixesMarc A. Paradise2019-05-012-49/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed incorrect option mapping where deprecated flags would have a 'long' taken from the replacement flag. Updated the behavior in case of conflicting flags (for example --ssh-user and --connection-user) to avoid surprising results by failing with an error instead of trying to resolve intent. Renamed things a bit for readability/consistency. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* | Bump version to 15.0.248 by Chef Expeditorv15.0.248Chef Expeditor2019-05-016-14/+15
| | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | Merge pull request #8444 from jaymalasinha/jsinha/update_chefstyleTim Smith2019-05-012-8/+8
|\ \ | |/ |/| Update InSpec to 4.3.2
| * Update Gemfile.lockjsinha/update_gemJaymala Sinha2019-05-012-8/+8
|/ | | | Signed-off-by: Jaymala Sinha <jsinha@chef.io>
* Bump version to 15.0.247 by Chef Expeditorv15.0.247Chef Expeditor2019-05-016-14/+15
| | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8417 from jaymzh/link_messageLamont Granquist2019-04-303-1/+10
|\ | | | | file: Tell people what file a link is pointing at in warning messages
| * Tell people what file a link is pointing at.Phil Dibowitz2019-04-293-1/+10
| | | | | | | | | | | | | | | | | | In the event you are managing a file `/etc/file` with a `file` resource, but it turns out to be a link to `/etc/passwd` and you are trying to figure out what overwrite `/etc/passwd`, there is no indication in the logs. Let's add one. Signed-off-by: Phil Dibowitz <phil@ipom.com>
* | Bump version to 15.0.246 by Chef Expeditorv15.0.246Chef Expeditor2019-04-305-11/+11
| | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | Merge pull request #8443 from chef/lcg/update-omnibus-softwareLamont Granquist2019-04-301-3/+3
|\ \ | | | | | | bump omnibus-software
| * | bump omnibus-softwareLamont Granquist2019-04-301-3/+3
|/ / | | | | | | | | | | pull in the fixes to appbundling chef+chef-bin Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Bump version to 15.0.245 by Chef Expeditorv15.0.245Chef Expeditor2019-04-306-14/+15
| | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | Merge pull request #8439 from chef/lcg/fix-bundling-in-omnibusLamont Granquist2019-04-301-1/+9
|\ \ | | | | | | fix chef-bin bundling in omnibus
| * | rubocop Bundler/DuplicatedGem is annoyinglcg/fix-bundling-in-omnibusLamont Granquist2019-04-301-2/+4
| | | | | | | | | | | | | | | | | | | | | issues against Bundler/DuplicatedGem not understanding if-else blocks have been closed. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * | fix chef-bin bundling in omnibusLamont Granquist2019-04-301-1/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | this file winds up in the embedded lib at: /opt/chef/embedded/lib/ruby/gems/x.y.0/gems/chef-X.Y.Z/Gemfile It needs to find the chef-bin gem from the same library, rather than simply omitting it. The chef-config gem comes in through the chef.gemspec so the lines are different. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Bump version to 15.0.244 by Chef Expeditorv15.0.244Chef Expeditor2019-04-306-14/+15
| | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | Merge pull request #8435 from ↵Tim Smith2019-04-301-1/+1
|\ \ | | | | | | | | | | | | MsysTechnologiesllc/vasundhara/Fix_for_bootstrap_error_while_using_msi_url_error Fixed bootstrap error while using --msi-url option with knife bootstrap winrm
| * | Fixed conditionVasu11052019-04-301-1/+1
| | | | | | | | | | | | Signed-off-by: Vasu1105 <vasundhara.jagdale@msystechnologies.com>
| * | Fixed bootstrap error while using --msi-url option with knife bootstrap winrmVasu11052019-04-301-1/+1
|/ / | | | | | | Signed-off-by: Vasu1105 <vasundhara.jagdale@msystechnologies.com>
* | Bump version to 15.0.243 by Chef Expeditorv15.0.243Chef Expeditor2019-04-306-14/+15
| | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | Merge pull request #8430 from chef/lcg/move-windows-executablsLamont Granquist2019-04-291-2/+0
|\ \ | | | | | | remove windows executables from windows gemspec
| * | remove windows executables from windows gemspeclcg/move-windows-executablsLamont Granquist2019-04-291-2/+0
|/ / | | | | | | | | | | | | | | | | these are moved to chef-bin now. it looks like these were always duplicated in the chef.gemspec and probably unnecessary anyway? Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Bump version to 15.0.242 by Chef Expeditorv15.0.242Chef Expeditor2019-04-306-14/+15
| | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | Merge pull request #8424 from chef/typosTim Smith2019-04-293-7/+7
|\ \ | | | | | | Update property descriptions for new resources
| * | Update property descriptions for new resourcesTim Smith2019-04-293-7/+7
| | | | | | | | | | | | | | | | | | | | | The docs team performed copy editing on these on the docs site. This backports those changes. Signed-off-by: Tim Smith <tsmith@chef.io>
* | | Bump version to 15.0.241 by Chef Expeditorv15.0.241Chef Expeditor2019-04-306-14/+15
| | | | | | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | | Merge pull request #8427 from chef/lcg/missing-gem-publishTim Smith2019-04-291-0/+1
|\ \ \ | | | | | | | | missing gem publish.
| * | | missing gem publish.lcg/missing-gem-publishLamont Granquist2019-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | we decided to ship this to rubygems. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | | | Merge pull request #8426 from chef/bump_inspecTim Smith2019-04-292-7/+44
|\ \ \ \ | |/ / / |/| | | Update InSpec preview to 4.2.0