diff --git a/roles/base/meta/main.yml b/roles/base/meta/main.yml index 6ad8fadc5e..afa39decb2 100644 --- a/roles/base/meta/main.yml +++ b/roles/base/meta/main.yml @@ -1,3 +1,4 @@ --- dependencies: + - { role: ntp } - { role: dnf-automatic } diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 675e4d6fb4..9b73742f98 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -300,27 +300,6 @@ - name: Setup postfix include: postfix.yml -- name: install ntp.conf - template: src=ntp/ntp.conf.j2 dest=/etc/ntp.conf - tags: - - ntp - - config - - base - -- name: install ntp step-tickers - copy: src=ntp/step-tickers dest=/etc/ntp/step-tickers - tags: - - ntp - - config - - base - -- name: Start ntpd - service: name=ntpd state=running enabled=true - tags: - - ntp - - service - - base - # # This task installs some common scripts to /usr/local/bin # scripts are under roles/base/files/common-scripts diff --git a/roles/base/files/ntp/step-tickers b/roles/ntp/files/step-tickers similarity index 100% rename from roles/base/files/ntp/step-tickers rename to roles/ntp/files/step-tickers diff --git a/roles/ntp/tasks/main.yml b/roles/ntp/tasks/main.yml new file mode 100644 index 0000000000..809abc2da2 --- /dev/null +++ b/roles/ntp/tasks/main.yml @@ -0,0 +1,27 @@ +- name: install ntp + package: name=ntp state=present + tags: + - ntp + - package + - base + +- name: install ntp.conf + template: src=ntp.conf.j2 dest=/etc/ntp.conf + tags: + - ntp + - config + - base + +- name: install ntp step-tickers + copy: src=step-tickers dest=/etc/ntp/step-tickers + tags: + - ntp + - config + - base + +- name: Start ntpd + service: name=ntpd state=running enabled=true + tags: + - ntp + - service + - base diff --git a/roles/base/templates/ntp/ntp.conf.j2 b/roles/ntp/templates/ntp.conf.j2 similarity index 100% rename from roles/base/templates/ntp/ntp.conf.j2 rename to roles/ntp/templates/ntp.conf.j2 diff --git a/vars/CentOS.yml b/vars/CentOS.yml index e32f53a34a..bd4c73c7b3 100644 --- a/vars/CentOS.yml +++ b/vars/CentOS.yml @@ -1,6 +1,6 @@ --- dist_tag: el{{ ansible_distribution_version[0] }} -base_pkgs_inst: [ 'ntp' ] +base_pkgs_inst: [] base_pkgs_erase: ['firstboot-tui','bluez-utils', 'sendmail'] service_disabled: [] service_enabled: [] diff --git a/vars/Fedora.yml b/vars/Fedora.yml index ad1434a50e..c985f44c28 100644 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -1,6 +1,6 @@ --- dist_tag: f{{ ansible_distribution_version }} -base_pkgs_inst: ['iptables-services', 'ntp' ] +base_pkgs_inst: ['iptables-services' ] base_pkgs_erase: ['firewalld', 'PackageKit*', 'sendmail', 'at'] service_disabled: [ ] service_enabled: ['auditd'] diff --git a/vars/RedHat.yml b/vars/RedHat.yml index e32f53a34a..bd4c73c7b3 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,6 +1,6 @@ --- dist_tag: el{{ ansible_distribution_version[0] }} -base_pkgs_inst: [ 'ntp' ] +base_pkgs_inst: [] base_pkgs_erase: ['firstboot-tui','bluez-utils', 'sendmail'] service_disabled: [] service_enabled: []