summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Pass channel directly into the script/url to determine Chef Infra downloadmp/bootstrap/restore-prereleaseMarc A. Paradise2019-05-037-139/+55
| | | | Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Update readme with deprecation info for --prereleaseMarc A. Paradise2019-05-031-1/+2
| | | | Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* `prerelease` -> `channel` in bootstrap contextsMarc A. Paradise2019-05-035-63/+67
| | | | | | | | | | | | Updates BootstrapContext and WindowsBootstrapContext to expect a 'channel' config value instead of a 'prelease' value. This removes the old behavior of inferring pre-release (current) from the presence of a fourth version number in the version string (eg 1.2.3.pre) - that was specific to gem installs, and gem installs are not used in bootstrap. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Change 'prerelease' to 'channel'.Marc A. Paradise2019-05-032-41/+58
| | | | | | | | | | | | | This adds support for deprecating a boolean flag into a non-boolean value, and uses it to make `--prerelease` deprecated in favor of `--channel current`. By default, `channel` is `stable`. Separately, all deprecated options are now configured to display at the end of the options list, instead of mixed into the non-deprecated list. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Make config_source aware of cli defaultsMarc A. Paradise2019-05-032-25/+21
| | | | | | | | | | | | | | | If a value comes from CLI defaults, it will now return :cli_default. This supports verifying deprecations when we need to know if a value was actually supplied from the CLI, or if it was defaulted from CLI options. Since we have all of the original sources still available, this also makes it so that we don't keep a separate hash for tracking config source - we're just checking in the original config sources in order that matches merge priority. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Restore bootstrap pre-release supportMarc A. Paradise2019-05-036-14/+86
| | | | | | | | | | | | | | It was originally removed after discussion in community slack, but it turns out to have a little more utility than we thought. When enabled, it will cause the package to be downloaded from the `current` channel. Option description has been updated from 'install prerelease gem' to 'install from current channel'. This commit otherwise restores the original behavior and adds some tests. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
* Bump version to 15.0.258 by Chef Expeditorv15.0.258Chef Expeditor2019-05-036-14/+15
| | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8454 from chef/more_brandingTim Smith2019-05-035-14/+16
|\ | | | | Update more brand names to current
| * Update more brand names to currentTim Smith2019-05-035-14/+16
| | | | | | | | | | | | Update Chef Client and Chef Server brand names to current. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Bump version to 15.0.257 by Chef Expeditorv15.0.257Chef Expeditor2019-05-036-14/+15
|/ | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8452 from chef/brandingTim Smith2019-05-0331-208/+225
|\ | | | | Add connstant for Chef Server and improve help messaging
| * More periods and product constantsbrandingTim Smith2019-05-0220-75/+78
| | | | | | | | | | | | A few formatting fixes as well Signed-off-by: Tim Smith <tsmith@chef.io>
| * Improve the warning message about legacy validation key regTim Smith2019-05-021-2/+2
| | | | | | | | | | | | It's the legacy method. Call it that and maybe people will stop using it. Signed-off-by: Tim Smith <tsmith@chef.io>
| * Provide a friendly list of supported options in helpTim Smith2019-05-021-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Makes for much better output: Valid choices are plaintext kerberos ssl negotiate. vs Valid choices are 'plaintext', 'kerberos', 'ssl' and 'negotiate'. Signed-off-by: Tim Smith <tsmith@chef.io>
| * Update specs for the new messagesTim Smith2019-05-024-4/+4
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Update more help descriptionsTim Smith2019-05-026-17/+18
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Fix a description I missedTim Smith2019-05-021-1/+1
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Fix up main binary help messagesTim Smith2019-05-025-109/+110
| | | | | | | | | | | | | | | | Periods after each sentence Use the branding better Fix some weird capitalization Signed-off-by: Tim Smith <tsmith@chef.io>
| * Add a dist value for the chef serverTim Smith2019-05-021-0/+3
|/ | | | | | We talk about the server in messages and we need to brand that appropriately Signed-off-by: Tim Smith <tsmith@chef.io>
* Bump version to 15.0.256 by Chef Expeditorv15.0.256Chef Expeditor2019-05-036-14/+15
| | | | Obvious fix; these changes are the result of automation not creative thinking.
* Merge pull request #8415 from ↵Tim Smith2019-05-021-2/+9
|\ | | | | | | | | MsysTechnologiesllc/Vijay/MSYS-1005_knife_status_long_output_runlist Fixed empty value for knife status long output
| * Fixed empty value for knife status long outputVijay Mali2019-04-301-2/+9
| | | | | | | | Signed-off-by: Vijay Mali <vijay.mali@msystechnologies.com>
* | Bump version to 15.0.255 by Chef Expeditorv15.0.255Chef Expeditor2019-05-036-14/+15
| | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | Merge pull request #8440 from chef/CHEF-8432/fix-default-protocolBryan McLellan2019-05-024-80/+186
|\ \ | | | | | | [CHEF-8432] Ensure default protocol is used properly. Use correct 'require' before accessing Net::SSH constants.
| * | 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.254 by Chef Expeditorv15.0.254Chef Expeditor2019-05-026-14/+15
| | | | | | | | | | | | Obvious fix; these changes are the result of automation not creative thinking.
* | | Merge pull request #8448 from cc-build/product_distTim Smith2019-05-029-27/+30
|\ \ \ | |/ / |/| | Replace Chef Client by its constant in Chef::Dist
| * | One missed fix on functionnal testTensibai2019-05-021-2/+2
| | | | | | | | | | | | Signed-off-by: Tensibai <tensibai@iabis.net>
| * | Fix a sentence in run_lock and the knife test to match the latest output changesTensibai2019-05-022-6/+6
| | | | | | | | | | | | Signed-off-by: Tensibai <tensibai@iabis.net>
| * | Reload the changes, adapt a bitTensibai2019-05-026-16/+19
| | | | | | | | | | | | Signed-off-by: Tensibai <tensibai@iabis.net>
| * | Add the periods, squash and signoffTensibai2019-05-021-4/+4
| | | | | | | | | | | | Signed-off-by: Tensibai <tensibai@iabis.net>
* | | 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>
View Lorry Controller Status