From 453c299ed7ef606278a7148e300382e53ad307fd Mon Sep 17 00:00:00 2001
From: Ivan Font <ivan.font@redhat.com>
Date: Thu, 9 Jun 2016 18:32:55 -0700
Subject: [PATCH] Add option to enable ntp

This fixes: #845 only for non-containerized deployments

Signed-off-by: Ivan Font <ivan.font@redhat.com>
---
 group_vars/all.sample                               |  3 +++
 roles/ceph-common/defaults/main.yml                 |  3 +++
 roles/ceph-common/tasks/checks/check_ntp_debian.yml |  7 +++++++
 roles/ceph-common/tasks/checks/check_ntp_redhat.yml |  7 +++++++
 roles/ceph-common/tasks/main.yml                    | 10 ++++++++++
 roles/ceph-common/tasks/misc/ntp_debian.yml         | 11 +++++++++++
 roles/ceph-common/tasks/misc/ntp_redhat.yml         | 11 +++++++++++
 7 files changed, 52 insertions(+)
 create mode 100644 roles/ceph-common/tasks/checks/check_ntp_debian.yml
 create mode 100644 roles/ceph-common/tasks/checks/check_ntp_redhat.yml
 create mode 100644 roles/ceph-common/tasks/misc/ntp_debian.yml
 create mode 100644 roles/ceph-common/tasks/misc/ntp_redhat.yml

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 963b4a128..9820cf37f 100644
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -64,6 +64,9 @@ dummy:
 #  - ntp
 #  - python-setuptools
 
+# Enable the ntp service by default to avoid clock skew on
+# ceph nodes
+#ntp_service_enabled: true
 
 # The list of ceph packages needed for debian.
 # This variable should only be changed if packages are not available from a given
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index a8d135437..67a66a5f9 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -56,6 +56,9 @@ redhat_package_dependencies:
   - ntp
   - python-setuptools
 
+# Enable the ntp service by default to avoid clock skew on
+# ceph nodes
+ntp_service_enabled: true
 
 # The list of ceph packages needed for debian.
 # This variable should only be changed if packages are not available from a given
diff --git a/roles/ceph-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
new file mode 100644
index 000000000..21d12163a
--- /dev/null
+++ b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
@@ -0,0 +1,7 @@
+---
+- name: check ntp installation on debian
+  command: dpkg -s ntp
+  register: ntp_pkg_query
+  ignore_errors: true
+  changed_when: false
+  when: ansible_os_family == 'Debian'
diff --git a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
new file mode 100644
index 000000000..b55a0d3c9
--- /dev/null
+++ b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
@@ -0,0 +1,7 @@
+---
+- name: check ntp installation on redhat
+  command: rpm -q ntp
+  register: ntp_pkg_query
+  ignore_errors: true
+  changed_when: false
+  when: ansible_os_family == 'RedHat'
diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 0df9ea79c..587ca4892 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -71,6 +71,16 @@
   tags:
     - package-install
 
+- include: ./misc/ntp_redhat.yml
+  when:
+    - ansible_os_family == 'RedHat'
+    - ntp_service_enabled
+
+- include: ./misc/ntp_debian.yml
+  when:
+    - ansible_os_family == 'Debian'
+    - ntp_service_enabled
+
 - include: facts.yml
 
 - set_fact:
diff --git a/roles/ceph-common/tasks/misc/ntp_debian.yml b/roles/ceph-common/tasks/misc/ntp_debian.yml
new file mode 100644
index 000000000..62db3469c
--- /dev/null
+++ b/roles/ceph-common/tasks/misc/ntp_debian.yml
@@ -0,0 +1,11 @@
+---
+- include: ../checks/check_ntp_debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: start the ntp service
+  service:
+    name: ntp
+    enabled: yes
+    state: started
+  when:
+    - ntp_pkg_query.rc == 0
diff --git a/roles/ceph-common/tasks/misc/ntp_redhat.yml b/roles/ceph-common/tasks/misc/ntp_redhat.yml
new file mode 100644
index 000000000..b64b9d8cd
--- /dev/null
+++ b/roles/ceph-common/tasks/misc/ntp_redhat.yml
@@ -0,0 +1,11 @@
+---
+- include: ../checks/check_ntp_redhat.yml
+  when: ansible_os_family == 'RedHat'
+
+- name: start the ntp service
+  service:
+    name: ntpd
+    enabled: yes
+    state: started
+  when:
+    - ntp_pkg_query.rc == 0
-- 
2.39.5