Browse Source

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
Clark Boylan 8 months ago
parent
commit
0269710c86

+ 0
- 14
roles/puppet-install/tasks/puppet-install/CentOS.yaml View File

@@ -18,20 +18,6 @@
18 18
         state: present
19 19
         update_cache: yes
20 20
 
21
-    # wipe out templatedir so we don't get warnings
22
-    - name: Remove templatedir
23
-      lineinfile:
24
-        path: /etc/puppet/puppet.conf
25
-        state: absent
26
-        regexp: 'templatedir'
27
-
28
-    # wipe out server, as we don't have one
29
-    - name: Remove server
30
-      lineinfile:
31
-        path: /etc/puppet/puppet.conf
32
-        state: absent
33
-        regexp: 'server'
34
-
35 21
 - name: Install puppet 4 packages
36 22
   when: puppet_install_version == 4
37 23
   become: true

+ 0
- 13
roles/puppet-install/tasks/puppet-install/trusty.yaml View File

@@ -19,19 +19,6 @@
19 19
         name:
20 20
           - puppet
21 21
           - ruby
22
-    # wipe out templatedir so we don't get warnings
23
-    - name: Remove templatedir
24
-      lineinfile:
25
-        path: /etc/puppet/puppet.conf
26
-        state: absent
27
-        regexp: 'templatedir'
28
-    # wipe out server, as we don't have one
29
-    - name: Remove server
30
-      lineinfile:
31
-        path: /etc/puppet/puppet.conf
32
-        state: absent
33
-        regexp: 'server'
34
-
35 22
 
36 23
 - name: Install puppet 4 packages
37 24
   when: puppet_install_version == 4

+ 0
- 14
roles/puppet-install/tasks/puppet-install/xenial.yaml View File

@@ -15,20 +15,6 @@
15 15
           - puppet
16 16
           - ruby
17 17
 
18
-    # wipe out templatedir so we don't get warnings
19
-    - name: Remove templatedir
20
-      lineinfile:
21
-        path: /etc/puppet/puppet.conf
22
-        state: absent
23
-        regexp: 'templatedir'
24
-
25
-    # wipe out server, as we don't have one
26
-    - name: Remove server
27
-      lineinfile:
28
-        path: /etc/puppet/puppet.conf
29
-        state: absent
30
-        regexp: 'server'
31
-
32 18
 - name: Install puppet 4 packages
33 19
   when: puppet_install_version == 4
34 20
   become: true

Loading…
Cancel
Save