Merge "ntpd behind proxy fails"

This commit is contained in:
Jenkins 2017-07-27 08:00:20 +00:00 committed by Gerrit Code Review
commit 2f809c15b0
2 changed files with 15 additions and 4 deletions
ansible/roles/baremetal

@ -9,6 +9,8 @@ customize_etc_hosts: True
create_kolla_user: True
enable_host_ntp: True
docker_storage_driver: ""
debian_pkg_install:

@ -66,18 +66,23 @@
name: ntp
state: stopped
become: True
when: ansible_os_family == "Debian"
when:
- ansible_os_family == "Debian"
- enable_host_ntp | bool
- name: Stop time service
service:
name: ntpd
state: stopped
become: True
when: ansible_os_family == "RedHat"
when:
- ansible_os_family == "RedHat"
- enable_host_ntp | bool
- name: Synchronizing time one-time
command: ntpd -gq
become: True
when: enable_host_ntp | bool
- name: Start time sync service
service:
@ -85,7 +90,9 @@
state: started
enabled: yes
become: True
when: ansible_os_family == "Debian"
when:
- ansible_os_family == "Debian"
- enable_host_ntp | bool
- name: Start time sync service
service:
@ -93,7 +100,9 @@
state: started
enabled: yes
become: True
when: ansible_os_family == "RedHat"
when:
- ansible_os_family == "RedHat"
- enable_host_ntp | bool
- name: Reboot
command: reboot -f