Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Puppet 6 support #316

Merged
merged 1 commit into from
Jul 29, 2019
Merged

Puppet 6 support #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def get_puppet_path():
puppet_path = None
if puppet_major_version == 3:
puppet_path = '/usr/bin/puppet'
elif puppet_major_version in [4, 5]:
elif puppet_major_version in [4, 5, 6]:
puppet_path = '/opt/puppetlabs/puppet/bin/puppet'

if not puppet_path:
Expand Down Expand Up @@ -585,7 +585,7 @@ def install_puppet_agent():
rundir = /var/run/puppet
ssldir = $vardir/ssl
"""
elif puppet_major_version in [4, 5]:
elif puppet_major_version in [4, 5, 6]:
puppet_conf_file = '/etc/puppetlabs/puppet/puppet.conf'
main_section = """[main]
vardir = /opt/puppetlabs/puppet/cache
Expand Down Expand Up @@ -1496,7 +1496,7 @@ def exec_service(service, command, failonerror=True):
puppet_conf_path = '/etc/puppet/puppet.conf'
var_dir = '/var/lib/puppet'
ssl_dir = '/var/lib/puppet/ssl'
elif puppet_version in [4, 5]:
elif puppet_version in [4, 5, 6]:
puppet_conf_path = '/etc/puppetlabs/puppet/puppet.conf'
var_dir = '/opt/puppetlabs/puppet/cache'
ssl_dir = '/etc/puppetlabs/puppet/ssl'
Expand Down