From 0269710c86b0a17af276a07c3bfccb32558b9cba Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 28 Aug 2018 16:51:32 -0700
Subject: [PATCH] Don't manage puppet.conf during puppet-install

The ansible-role-puppet role manages puppet.conf for us. These two roles
are currently fighting each other over the presence of the server line
in puppet.conf. Avoid this by removing the removal of this line and the
templatedir line from the new puppet-install role since
ansible-role-puppet was there first. Basically just trust
ansible-role-puppet to write a working puppet.conf for us.

Change-Id: Ifb1dff31a61071bd867d3a7cc3cbcc496177e3ce
---
 .../tasks/puppet-install/CentOS.yaml               | 14 --------------
 .../tasks/puppet-install/trusty.yaml               | 13 -------------
 .../tasks/puppet-install/xenial.yaml               | 14 --------------
 3 files changed, 41 deletions(-)

diff --git a/roles/puppet-install/tasks/puppet-install/CentOS.yaml b/roles/puppet-install/tasks/puppet-install/CentOS.yaml
index 64dc70e968..dcb95d51ca 100644
--- a/roles/puppet-install/tasks/puppet-install/CentOS.yaml
+++ b/roles/puppet-install/tasks/puppet-install/CentOS.yaml
@@ -18,20 +18,6 @@
         state: present
         update_cache: yes
 
-    # wipe out templatedir so we don't get warnings
-    - name: Remove templatedir
-      lineinfile:
-        path: /etc/puppet/puppet.conf
-        state: absent
-        regexp: 'templatedir'
-
-    # wipe out server, as we don't have one
-    - name: Remove server
-      lineinfile:
-        path: /etc/puppet/puppet.conf
-        state: absent
-        regexp: 'server'
-
 - name: Install puppet 4 packages
   when: puppet_install_version == 4
   become: true
diff --git a/roles/puppet-install/tasks/puppet-install/trusty.yaml b/roles/puppet-install/tasks/puppet-install/trusty.yaml
index c61b3c4c55..cf6f1c1d7f 100644
--- a/roles/puppet-install/tasks/puppet-install/trusty.yaml
+++ b/roles/puppet-install/tasks/puppet-install/trusty.yaml
@@ -19,19 +19,6 @@
         name:
           - puppet
           - ruby
-    # wipe out templatedir so we don't get warnings
-    - name: Remove templatedir
-      lineinfile:
-        path: /etc/puppet/puppet.conf
-        state: absent
-        regexp: 'templatedir'
-    # wipe out server, as we don't have one
-    - name: Remove server
-      lineinfile:
-        path: /etc/puppet/puppet.conf
-        state: absent
-        regexp: 'server'
-
 
 - name: Install puppet 4 packages
   when: puppet_install_version == 4
diff --git a/roles/puppet-install/tasks/puppet-install/xenial.yaml b/roles/puppet-install/tasks/puppet-install/xenial.yaml
index 516e73094b..ea64ebd7aa 100644
--- a/roles/puppet-install/tasks/puppet-install/xenial.yaml
+++ b/roles/puppet-install/tasks/puppet-install/xenial.yaml
@@ -15,20 +15,6 @@
           - puppet
           - ruby
 
-    # wipe out templatedir so we don't get warnings
-    - name: Remove templatedir
-      lineinfile:
-        path: /etc/puppet/puppet.conf
-        state: absent
-        regexp: 'templatedir'
-
-    # wipe out server, as we don't have one
-    - name: Remove server
-      lineinfile:
-        path: /etc/puppet/puppet.conf
-        state: absent
-        regexp: 'server'
-
 - name: Install puppet 4 packages
   when: puppet_install_version == 4
   become: true