opendev/system-config
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2019-04-09 03:44:14 +00:00 committed by Gerrit Code Review
commit 713b98298e
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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

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

@ -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