ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1399 from guits/fix_ntp_install 

Common: Do not install ntp when ntp_service_enabled is false
pull/1404/head
Sébastien Han 2017-03-29 11:50:27 +02:00 committed by GitHub
parent b57c51fda2 4e62627202
commit a3ca0b3eb3
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
group_vars/all.yml.sample
View File

@ -56,20 +56,17 @@ dummy:
#debian_package_dependencies: #debian_package_dependencies:
# - python-pycurl # - python-pycurl
# - hdparm # - hdparm
# - ntp
#centos_package_dependencies: #centos_package_dependencies:
# - python-pycurl # - python-pycurl
# - hdparm # - hdparm
# - epel-release # - epel-release
# - ntp
# - python-setuptools # - python-setuptools
# - libselinux-python # - libselinux-python
#redhat_package_dependencies: #redhat_package_dependencies:
# - python-pycurl # - python-pycurl
# - hdparm # - hdparm
# - ntp
# - python-setuptools # - python-setuptools
# Enable the ntp service by default to avoid clock skew on # Enable the ntp service by default to avoid clock skew on

3
roles/ceph-common/defaults/main.yml
View File

@ -48,20 +48,17 @@ upgrade_ceph_packages: False
debian_package_dependencies: debian_package_dependencies:
- python-pycurl - python-pycurl
- hdparm - hdparm
- ntp
centos_package_dependencies: centos_package_dependencies:
- python-pycurl - python-pycurl
- hdparm - hdparm
- epel-release - epel-release
- ntp
- python-setuptools - python-setuptools
- libselinux-python - libselinux-python
redhat_package_dependencies: redhat_package_dependencies:
- python-pycurl - python-pycurl
- hdparm - hdparm
- ntp
- python-setuptools - python-setuptools
# Enable the ntp service by default to avoid clock skew on # Enable the ntp service by default to avoid clock skew on

5
roles/ceph-common/tasks/checks/check_ntp_debian.yml
View File

@ -6,3 +6,8 @@
always_run: true always_run: true
changed_when: false changed_when: false
when: ansible_os_family == 'Debian' when: ansible_os_family == 'Debian'
- name: install ntp on debian
package:
name: ntp
state: present

5
roles/ceph-common/tasks/checks/check_ntp_redhat.yml
View File

@ -6,3 +6,8 @@
always_run: true always_run: true
changed_when: false changed_when: false
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- name: install ntp on redhat
package:
name: ntp
state: present