opendev/system-config
Code Issues Proposed changes

Add NTP service to base-server

Browse Source 
Removes puppet-side ntp setup.

Change-Id: I75a87ca55fd4b75c5715cc3fd2b708e0b0ae2c20
This commit is contained in:
David Shrewsbury 2018-08-22 14:41:11 -04:00 committed by James E. Blair
parent 15663daaf7
commit 360e0107a7
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/manifests/server.pp
View File

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

1
playbooks/roles/base-server/defaults/main.yaml
View File

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

6
playbooks/roles/base-server/tasks/main.yaml
View File

@ -60,6 +60,12 @@
src: bash-history.sh src: bash-history.sh
dest: /etc/profile.d/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 - name: Include OS-specific tasks
include_tasks: "{{ lookup('first_found', file_list) }}" include_tasks: "{{ lookup('first_found', file_list) }}"
vars: vars:

1
playbooks/roles/base-server/vars/Debian.yaml
View File

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

1
playbooks/roles/base-server/vars/RedHat.yaml
View File

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

1
playbooks/roles/base-server/vars/Ubuntu.trusty.yaml
View File

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