Add NTP service to base-server

Removes puppet-side ntp setup.

Change-Id: I75a87ca55fd4b75c5715cc3fd2b708e0b0ae2c20

modules/openstack_project/manifests/server.pp

@@ -19,11 +19,6 @@ class openstack_project::server (
     include ::apt
   }
 
-  ###########################################################
-  # Manage  ntp
-
-  include '::ntp'
-
   ###########################################################
   # Process if ( $high_level_directive ) blocks
 

playbooks/roles/base-server/defaults/main.yaml

@@ -5,6 +5,7 @@ base_packages:
   - at
   - git
   - lvm2
+  - ntp
   - openssh-server
   - parted
   - rsync

playbooks/roles/base-server/tasks/main.yaml

@@ -60,6 +60,12 @@
     src: bash-history.sh
     dest: /etc/profile.d/bash-history.sh
 
+- name: Ensure NTP service is running
+  service:
+    name: "{{ ntp_service_name }}"
+    enabled: yes
+    state: started
+
 - name: Include OS-specific tasks
   include_tasks: "{{ lookup('first_found', file_list) }}"
   vars:

playbooks/roles/base-server/vars/Debian.yaml

@@ -5,3 +5,4 @@ distro_packages:
   - vim-nox
 sftp_path: /usr/lib/openssh/sftp-server
 ssh_service_name: ssh
+ntp_service_name: ntp

playbooks/roles/base-server/vars/RedHat.yaml

@@ -11,3 +11,4 @@ distro_packages:
   - yum-cron
 sftp_path: /usr/libexec/openssh/sftp-server
 ssh_service_name: sshd
+ntp_service_name: ntpd

playbooks/roles/base-server/vars/Ubuntu.trusty.yaml

@@ -5,3 +5,4 @@ distro_packages:
   - vim-nox
 sftp_path: /usr/lib/openssh/sftp-server
 ssh_service_name: ssh
+ntp_service_name: ntp