From cbde11a1589e112b306083ee1c23d81da3ae2fa3 Mon Sep 17 00:00:00 2001 From: Aaron Guise Date: Tue, 22 Nov 2016 11:59:24 +1300 Subject: [PATCH] Cleaning up --- tasks/RedHat.yml | 19 +++++++++++-------- tasks/Windows.yml | 4 ++-- templates/ntp.conf.j2 | 19 ------------------- 3 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 templates/ntp.conf.j2 diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 73221c4..a178ddd 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -1,12 +1,21 @@ --- # tasks file for common role + +- name: Ensure common packages + yum: + name: "{{item}}" + state: present + enablerepo: epel + with_items: "{{ common_packages }}" + tags: packages + - name: Ensure SELinux status selinux: state: disabled register: sestate tags: security - + - debug: msg: "SELinux {{ sestate.msg }}" when: sestate.changed @@ -21,13 +30,7 @@ line: "installonly_limit=2" tags: packages -- name: Ensure common packages - yum: - name: "{{item}}" - state: present - enablerepo: epel - with_items: "{{ common_packages }}" - tags: packages + - name: Ensure Hostname is set hostname: diff --git a/tasks/Windows.yml b/tasks/Windows.yml index 3c9acf6..4e7dad1 100644 --- a/tasks/Windows.yml +++ b/tasks/Windows.yml @@ -13,8 +13,8 @@ changed_when: false - name: Ensure System Culture Set - win_locale: - culture: en-NZ + win_locale: + culture: en-NZ - name: Ensure DNS is set win_dns: diff --git a/templates/ntp.conf.j2 b/templates/ntp.conf.j2 deleted file mode 100644 index 8be1852..0000000 --- a/templates/ntp.conf.j2 +++ /dev/null @@ -1,19 +0,0 @@ -# This file is managed by Ansible # -## DO NOT edit manually as changes will be overwritten ## - -driftfile /var/lib/ntp/drift -restrict default kod nomodify notrap nopeer noquery -restrict -6 default kod nomodify notrap nopeer noquery -restrict 127.0.0.1 -restrict -6 ::1 - -# Use servers configured via Ansible -{% for server in ntp_servers %} -server {{ server }} -{% endfor %} - -# Fallback -server nz.pool.ntp.org - -includefile /etc/ntp/crypto/pw -keys /etc/ntp/keys