From 939fddeca6fb5b67357b808a753fc48b923a7425 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 8 Jul 2015 16:48:16 -0500 Subject: [PATCH] testnode: do not modify resolv.conf on ubuntu There is no need to modify resolv.conf for ubuntu anymore. When using cobbler this is set by using the resolvconf var in the cobbler role. For vms, like ones created by openstack, this allows ubuntu nodes to use the resolv.conf already provided. Signed-off-by: Andrew Schoen --- roles/testnode/handlers/main.yml | 5 ----- roles/testnode/tasks/setup-ubuntu.yml | 13 ------------- roles/testnode/templates/resolvconf/base | 4 ---- roles/testnode/templates/resolvconf/base_octo | 3 --- roles/testnode/templates/resolvconf/base_typica | 4 ---- 5 files changed, 29 deletions(-) delete mode 100644 roles/testnode/templates/resolvconf/base delete mode 100644 roles/testnode/templates/resolvconf/base_octo delete mode 100644 roles/testnode/templates/resolvconf/base_typica diff --git a/roles/testnode/handlers/main.yml b/roles/testnode/handlers/main.yml index d8e634d..5724fc6 100644 --- a/roles/testnode/handlers/main.yml +++ b/roles/testnode/handlers/main.yml @@ -40,8 +40,3 @@ service: name: nagios-nrpe-server state: restarted - -- name: restart resolvdns - service: - name: resolvconf - state: restarted diff --git a/roles/testnode/tasks/setup-ubuntu.yml b/roles/testnode/tasks/setup-ubuntu.yml index 29ba7cb..cb02b2a 100644 --- a/roles/testnode/tasks/setup-ubuntu.yml +++ b/roles/testnode/tasks/setup-ubuntu.yml @@ -88,19 +88,6 @@ script: scripts/static-ip.sh creates=/static-ip-setup when: "'vps' not in group_names" -- name: Upload a lab specific base resolv.conf. - template: - src: "{{ item }}" - dest: /etc/resolvconf/resolv.conf.d/base - owner: root - group: root - mode: 0755 - with_first_found: - - "resolvconf/base_{{ lab_name }}" - - resolvconf/base - notify: - - restart resolvdns - - name: Edit lvm.conf to support LVM on RBD. lineinfile: dest: /etc/lvm/lvm.conf diff --git a/roles/testnode/templates/resolvconf/base b/roles/testnode/templates/resolvconf/base deleted file mode 100644 index 0dd0a49..0000000 --- a/roles/testnode/templates/resolvconf/base +++ /dev/null @@ -1,4 +0,0 @@ -# {{ ansible_managed }} -nameserver 10.214.128.4 -nameserver 10.214.128.5 -search front.sepia.ceph.com sepia.ceph.com diff --git a/roles/testnode/templates/resolvconf/base_octo b/roles/testnode/templates/resolvconf/base_octo deleted file mode 100644 index e1528e6..0000000 --- a/roles/testnode/templates/resolvconf/base_octo +++ /dev/null @@ -1,3 +0,0 @@ -# {{ ansible_managed }} -nameserver 10.10.160.1 -search ceph.redhat.com sepia.ceph.com diff --git a/roles/testnode/templates/resolvconf/base_typica b/roles/testnode/templates/resolvconf/base_typica deleted file mode 100644 index 412a5e6..0000000 --- a/roles/testnode/templates/resolvconf/base_typica +++ /dev/null @@ -1,4 +0,0 @@ -# {{ ansible_managed }} -nameserver 172.20.132.1 -nameserver 172.20.132.2 -search front.sepia.ceph.com sepia.ceph.com -- 2.39.5