Fix ntp config issue for multi-role nodes

Fix ntp config issue for multi-role nodes, when
controller related config is being changed by another role

Change-Id: I309f37c8904d81494be4193773741f4ba1654802
Closes-Bug: 1433969

deployment/puppet/cluster/files/ocf/ns_ntp

@@ -29,7 +29,7 @@
 OCF_ROOT_default="/usr/lib/ocf"
 
 OCF_RESKEY_ns_default="vrouter"
-OCF_RESKEY_conffile_default="/etc/ntp.conf"
+OCF_RESKEY_conffile_default="/etc/ntp.server.conf"
 OCF_RESKEY_pidfile_default="/var/run/ntpd.pid"
 OCF_RESKEY_binpath_default="/usr/sbin/ntpd"
 OCF_RESKEY_extraconf_default=""
@@ -231,7 +231,8 @@ get_ns() {
 }
 
 get_variables() {
-        get_ns
+  get_ns
+
   CONF_FILE="${OCF_RESKEY_conffile}"
   COMMAND="$RUN ${OCF_RESKEY_binpath}"
   PIDFILE="${OCF_RESKEY_pidfile}"
@@ -331,16 +332,12 @@ ntp_start()
     return $OCF_ERR_GENERIC
   fi
 
-
-
   if [ "${OCF_RESKEY_ns}" != '' ]; then
-
     set_ns_routing
-
   fi
 
   # run the ntp binary
-        ocf_run ${COMMAND} ${OCF_RESKEY_extraconf} -u ntp:ntp -p "${PIDFILE}" -g
+        ocf_run ${COMMAND} ${OCF_RESKEY_extraconf} -u ntp:ntp -p "${PIDFILE}" -g -c ${CONF_FILE}
   if [ $? -ne 0 ]; then
     ocf_log err "Error. ntp daemon returned error $?."
     return $OCF_ERR_GENERIC

deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp

@@ -1,9 +1,13 @@
 notice('MODULAR: ntp-client.pp')
 
-$management_vip = hiera('management_vrouter_vip')
+$management_vip  = hiera('management_vrouter_vip')
+$ntp_server_conf = inline_template("<% if File.exist?('/etc/ntp.server.conf') -%>true<% end -%>")
 
-class { 'ntp':
-  servers        => [$management_vip],
-  service_ensure => running,
-  service_enable => true,
+if ! $ntp_server_conf {
+  class { 'ntp':
+    servers        => [$management_vip],
+    service_ensure => running,
+    service_enable => true,
+  }
 }
+

deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp

@@ -7,6 +7,7 @@ class { 'ntp':
   servers        => strip(split($ntp_servers['ntp_list'], ',')),
   service_enable => false,
   service_ensure => stopped,
+  config         => '/etc/ntp.server.conf',
 } ->
 
 class { 'cluster::ntp_ocf':