Merge remote-tracking branch 'oc/bdero/fallback-dns' into jdmulloy/open-craft/bdero/fallback-dns

CHANGELOG.md

+- Role: common
+  - Added `COMMON_FALLBACK_DNS_SERVERS`, which optionally adds additional `nameserver` entries to the resolvconf tail
+  - Explicitly added `resolvconf` as a dependency
+
 - Role: discovery
   - Added `OPENEXCHANGERATES_API_KEY` for retrieving currency exchange rates.
 

playbooks/roles/common/tasks/main.yml

@@ -145,6 +145,19 @@
   shell: hostname -F /etc/hostname
   when: COMMON_HOSTNAME|length >0 and (etc_hosts.changed or etc_hostname.changed)
 
+- name: Add fallback DNS servers to resolvconf
+  lineinfile:
+    dest: /etc/resolvconf/resolv.conf.d/tail
+    line: "nameserver {{ item }}"
+    create: yes
+    state: present
+  with_items: "{{ COMMON_FALLBACK_DNS_SERVERS }}"
+
+- name: restart networking
+  service:
+    name: networking
+    state: restarted
+
 - name: Copy the templates to their respestive destination
   template:
     dest: "{{ item.dest }}"

playbooks/roles/common_vars/defaults/main.yml

@@ -66,6 +66,9 @@ COMMON_GIT_PATH: 'edx'  # git path prefix
 # override this var to set a different hostname
 COMMON_HOSTNAME: ""
 
+# List of DNS server addresses to append to resolvconf
+COMMON_FALLBACK_DNS_SERVERS: []
+
 # Set to true to customize DNS search domains
 COMMON_CUSTOM_DHCLIENT_CONFIG: false
 # uncomment and specifity your domains.
@@ -108,6 +111,7 @@ common_redhat_pkgs:
   - git
   - unzip
   - acl
+  - resolvconf
 common_debian_pkgs:
   - apt-transport-https
   - ntp
@@ -119,6 +123,7 @@ common_debian_pkgs:
   - unzip
   - python-pip
   - python2.7-dev
+  - resolvconf
 
 # Packages that should be installed from our custom PPA, i.e. COMMON_EDX_PPA
 old_python_debian_pkgs: