From ff24b2f8db16d9c160d378045f0a44d5369e2bf3 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 3 Dec 2015 12:12:00 -0700 Subject: [PATCH] Undo resolvconf hackery Signed-off-by: Zack Cerza --- roles/testnode/tasks/main.yml | 5 ++++ roles/testnode/tasks/resolvconf.yml | 40 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 roles/testnode/tasks/resolvconf.yml diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index bc1c877..3a751a5 100644 --- a/roles/testnode/tasks/main.yml +++ b/roles/testnode/tasks/main.yml @@ -71,6 +71,11 @@ tags: - pip +# include resolv.conf setup +- include: resolvconf.yml + tags: + - resolvconf + # Touch a file to indicate we are done. This is something chef did; # teuthology.task.internal.vm_setup() expects it. - name: Touch /ceph-qa-ready diff --git a/roles/testnode/tasks/resolvconf.yml b/roles/testnode/tasks/resolvconf.yml new file mode 100644 index 0000000..21af204 --- /dev/null +++ b/roles/testnode/tasks/resolvconf.yml @@ -0,0 +1,40 @@ +--- +- name: Purge resolvconf + apt: + name: resolvconf + state: absent + purge: yes + when: ansible_pkg_mgr == "apt" + +- name: Set interface + set_fact: + interface: "{{ hostvars[inventory_hostname].interface|default('eth0') }}" + +- name: Check for presence of /etc/network/interfaces + stat: + path: /etc/network/interfaces + get_checksum: no + get_md5: no + register: etc_network_interfaces + +- name: Rewrite /etc/network/interfaces to use dhcp + replace: + dest: /etc/network/interfaces + # This regexp matches a stanza like: + # iface eth0 inet static + # address 10.8.128.17 + # netmask 255.255.248.0 + # gateway 10.8.135.254 + # broadcast 10.8.135.255 + regexp: '^iface {{ interface }} inet static(\n\ +.*)+' + replace: "iface {{ interface }} inet dhcp\n" + when: etc_network_interfaces.stat.exists + register: dhcp_enabled + +- name: Set bounce_interface if we just enabled dhcp + set_fact: + bounce_interface: "{{ dhcp_enabled|changed }}" + +- name: ifdown and ifup + shell: "ifdown {{ interface }} && ifup {{ interface }}" + when: bounce_interface == "True" -- 2.39.5