diff --git a/library/centos/roles/basic-setup/meta/main.yml b/library/centos/roles/basic-setup/meta/main.yml new file mode 100644 index 00000000..eb548d9f --- /dev/null +++ b/library/centos/roles/basic-setup/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: '../../library/roles/ntp' diff --git a/library/centos/roles/basic-setup/tasks/main.yml b/library/centos/roles/basic-setup/tasks/main.yml index 5e1449fa..068c2e5f 100644 --- a/library/centos/roles/basic-setup/tasks/main.yml +++ b/library/centos/roles/basic-setup/tasks/main.yml @@ -71,16 +71,6 @@ when: configure_domain_name_in_interface tags: [ 'centos', 'bootstrap' ] -- name: Ensure that the ntpd service is enabled and running - service: name=ntpd state=started enabled=yes - when: centos_ntpd_enabled - tags: [ 'centos', 'bootstrap', 'ntp' ] - -- name: Ensure that the ntpd service is stopped and disabled - service: name=ntpd state=stopped enabled=no - when: not centos_ntpd_enabled - tags: [ 'centos', 'bootstrap', 'ntp' ] - - name: Stop avahi before removing it when it is not needed service: name=avahi-daemon state=stopped enabled=no when: centos_remove_avahi or centos_disable_avahi