Skip to content
Snippets Groups Projects
Commit 2a2953c6 authored by Bogdan Dobrelya's avatar Bogdan Dobrelya Committed by GitHub
Browse files

Merge pull request #893 from kubernetes-incubator/undo_hostresolvconf

Don't try to delete kargo specific config from dhclient when file does not exist
parents f004cc07 1054f377
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,10 @@
# These tasks will undo changes done by kargo in the past if needed (e.g. when upgrading from kargo 2.0.x
# or when changing resolvconf_mode)
- name: Check if dhclient conf file exists
stat: path={{dhclientconffile}}
register: dhclientconf_check
- name: Remove kargo specific config from dhclient config
blockinfile:
dest: "{{dhclientconffile}}"
......@@ -10,12 +14,13 @@
backup: yes
follow: yes
marker: "# Ansible entries {mark}"
when: dhclientconf_check.stat.exists
notify: Preinstall | restart network
- name: Remove kargo specific dhclient hook
file: path="{{ dhclienthookfile }}" state=absent
when: dhclienthookfile is defined
notify: Preinstall | restart network
when: ansible_os_family != "RedHat"
# We need to make sure the network is restarted early enough so that docker can later pick up the correct system
# nameservers and search domains
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment