lib/r10k/cli/deploy.rb in r10k-3.8.0 vs lib/r10k/cli/deploy.rb in r10k-3.9.0

- old
+ new

@@ -53,19 +53,20 @@ `r10k deploy environment` creates and updates Puppet environments based on Git branches. Environments can provide a Puppetfile at the root of the directory to deploy independent Puppet modules. To recursively deploy an environment, pass the -`--puppetfile` flag to the command. +`--modules` flag to the command. **NOTE**: If an environment has a Puppetfile when it is instantiated a recursive update will be forced. It is assumed that environments are dependent on modules specified in the Puppetfile and an update will be automatically scheduled. On subsequent deployments, Puppetfile deployment will default to off. DESCRIPTION - flag :p, :puppetfile, 'Deploy modules from a puppetfile' + flag :p, :puppetfile, 'Deploy modules (deprecated, use -m)' + flag :m, :modules, 'Deploy modules' option nil, :'default-branch-override', 'Specify a branchname to override the default branch in the puppetfile', argument: :required runner R10K::Action::CriRunner.wrap(R10K::Action::Deploy::Environment) end @@ -98,10 +99,11 @@ name 'display' aliases 'list' usage 'display' summary 'Display environments and modules in the deployment' - flag :p, :puppetfile, 'Display Puppetfile modules' + flag :p, :puppetfile, 'Display modules (deprecated, use -m)' + flag :m, :modules, 'Display modules' flag nil, :detail, 'Display detailed information' flag nil, :fetch, 'Update available environment lists from all remote sources' option nil, :format, 'Display output in a specific format. Valid values: json, yaml. Default: yaml', argument: :required