diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 3b71e9c536..7af5095b20 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -4,6 +4,21 @@ # This is the base role for all machines. # Things in here are things we want to do to every machine no matter what. # + +# XXX fixme # a datacenter 'fact' from setup +- name: /etc/resolv.conf + copy: src={{ item }} dest=/etc/resolv.conf + with_first_found: + - "{{ resolvconf }}" + - resolv.conf/{{ ansible_fqdn }} + - resolv.conf/{{ host_group }} + - resolv.conf/{{ datacenter }} + - resolv.conf/resolv.conf + tags: + - config + - resolvconf + - base + - name: global default packages to install yum: state=installed name={{ item }} with_items: @@ -111,20 +126,6 @@ - config - base -# XXX fixme # a datacenter 'fact' from setup -- name: /etc/resolv.conf - copy: src={{ item }} dest=/etc/resolv.conf - with_first_found: - - "{{ resolvconf }}" - - resolv.conf/{{ ansible_fqdn }} - - resolv.conf/{{ host_group }} - - resolv.conf/{{ datacenter }} - - resolv.conf/resolv.conf - tags: - - config - - resolvconf - - base - - name: rsyslog.conf copy: src={{ item }} dest=/etc/rsyslog.conf mode=644 with_first_found: