From 82a1acb4b4961e45edc1849f2f4f1cc21c7411a8 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Mon, 22 Jul 2019 10:10:38 +0200
Subject: [PATCH] Puppet 6 support

---
 bootstrap.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index 466f4ed..67dc99d 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -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:
@@ -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
@@ -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'