From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 14 Apr 2015 14:29:50 +0000 (-0500)
Subject: Upload lab-specific resolvconf base config files.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12559864b0516513180b9af4e3ef905379afda73;p=ceph-cm-ansible.git

Upload lab-specific resolvconf base config files.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/testnode/handlers/main.yml b/roles/testnode/handlers/main.yml
index 05d73f71..8eee2cf5 100644
--- a/roles/testnode/handlers/main.yml
+++ b/roles/testnode/handlers/main.yml
@@ -33,3 +33,8 @@
   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 4b64db49..314873ff 100644
--- a/roles/testnode/tasks/setup-ubuntu.yml
+++ b/roles/testnode/tasks/setup-ubuntu.yml
@@ -120,3 +120,16 @@
 # is not run on virtual machines
 - include: static_ip.yml
   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
diff --git a/roles/testnode/templates/resolvconf/base b/roles/testnode/templates/resolvconf/base
new file mode 100644
index 00000000..0dd0a49d
--- /dev/null
+++ b/roles/testnode/templates/resolvconf/base
@@ -0,0 +1,4 @@
+# {{ 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
new file mode 100644
index 00000000..64754450
--- /dev/null
+++ b/roles/testnode/templates/resolvconf/base_octo
@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+nameserver 10.10.160.1
+search ceph.redhat.com front.sepia.ceph.com sepia.ceph.com
diff --git a/roles/testnode/templates/resolvconf/base_typica b/roles/testnode/templates/resolvconf/base_typica
new file mode 100644
index 00000000..412a5e6c
--- /dev/null
+++ b/roles/testnode/templates/resolvconf/base_typica
@@ -0,0 +1,4 @@
+# {{ ansible_managed }}
+nameserver 172.20.132.1
+nameserver 172.20.132.2
+search front.sepia.ceph.com sepia.ceph.com