Merge "Don't manage puppet.conf during puppet-install"

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

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

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