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

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