Skip to content

Commit

Permalink
Merge pull request #207 from attachmentgenie/master
Browse files Browse the repository at this point in the history
bumping default version to puppet 6
  • Loading branch information
neillturner authored May 12, 2019
2 parents f06f9f9 + 139eb56 commit 98bdaaa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/kitchen/provisioner/puppet_apply.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class PuppetApply < Base
default_config :custom_post_apply_command, nil
default_config :puppet_whitelist_exit_code, nil
default_config :require_puppet_omnibus, false
default_config :puppet_omnibus_url, 'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_5_agent.sh'
default_config :puppet_omnibus_url, 'https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_6_agent.sh'
default_config :puppet_enc, nil
default_config :ignore_spec_fixtures, false

Expand Down
3 changes: 2 additions & 1 deletion provisioner_options.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ puppet_future_parser | false | Run puppet with the future parser enabled (see h
puppet_git_init | nil | initialize puppet from GIT repository, e.g. "git@github.com:example/puppet-repo.git"
puppet_git_pr | nil | checkout specific Pull Request from repository specified in puppet_git_init, e.g. "324"
puppet_logdest | nil | _Array_ of log destinations. Include 'console' if wanted
puppet_omnibus_url | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_5_agent.sh | omnibus puppet v5 install location.
puppet_omnibus_url | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_6_agent.sh | omnibus puppet v5 install location.
_for puppet v3 change to_ | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet.sh |
_for puppet v4 change to_ | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_agent.sh |
_for puppet v5 change to_ | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_5_agent.sh |
puppet_noop| false| puppet runs in a no-op or dry-run mode
puppet_no_sudo | false | allow puppet command to run without sudo if required
puppet_verbose| false| Extra information logging on puppet run
Expand Down

0 comments on commit 98bdaaa

Please sign in to comment.