diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-14 14:33:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 14:33:33 -0800 |
| commit | 7e6dc1daefa38003acfb0d9180da23e0330e8fde (patch) | |
| tree | 559bd06f47e187c677602662cbaf02f64f40a1d0 | |
| parent | a7462fda03cd9a749f20f0e5885b3dedefd0447e (diff) | |
| parent | 765f304f9c3e02bc78a1be2dcb5189a2e5478cd5 (diff) | |
| download | openshift-7e6dc1daefa38003acfb0d9180da23e0330e8fde.tar.gz openshift-7e6dc1daefa38003acfb0d9180da23e0330e8fde.tar.bz2 openshift-7e6dc1daefa38003acfb0d9180da23e0330e8fde.tar.xz openshift-7e6dc1daefa38003acfb0d9180da23e0330e8fde.zip | |
Merge pull request #6054 from nak3/cleanup-lb
Automatic merge from submit-queue.
Remove remaining haproxy files with uninstallation
Although OpenShift LB(HAProxy) distributes
`/etc/systemd/system/haproxy.service.d/limits.conf` and
`/etc/systemd/system/haproxy.service`, uninstall playbook does not
remove them now.
This patch changes to remove these files.
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 07f10d48c..403e1a5a3 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -525,3 +525,7 @@ with_items: - /etc/ansible/facts.d/openshift.fact - /var/lib/haproxy/stats + # Here we remove only limits.conf rather than directory, as users may put their files. + # - /etc/systemd/system/haproxy.service.d + - /etc/systemd/system/haproxy.service.d/limits.conf + - /etc/systemd/system/haproxy.service |