Merge "Do not install ntp package on host when not used" into stable/stein
This commit is contained in:
commit
285145bb6d
@ -85,14 +85,14 @@ debian_pkg_install:
|
||||
- git
|
||||
- "{% if not easy_install_available %}python-pip{% endif %}"
|
||||
- python-setuptools
|
||||
- ntp
|
||||
- "{% if enable_host_ntp | bool %}ntp{% endif %}"
|
||||
- "{% if enable_ceph_nfs|bool %}rpcbind{% endif %}"
|
||||
|
||||
redhat_pkg_install:
|
||||
- "{{ docker_yum_package }}"
|
||||
- git
|
||||
- python-setuptools
|
||||
- ntp
|
||||
- "{% if enable_host_ntp | bool %}ntp{% endif %}"
|
||||
- sudo
|
||||
|
||||
ubuntu_pkg_removals:
|
||||
|
@ -74,7 +74,9 @@
|
||||
update_cache: yes
|
||||
become: True
|
||||
with_items: "{{ redhat_pkg_install }}"
|
||||
when: ansible_os_family == 'RedHat'
|
||||
when:
|
||||
- ansible_os_family == 'RedHat'
|
||||
- item != ""
|
||||
register: yum_install_result
|
||||
|
||||
# If any packages were updated, and any containers were running, wait for the
|
||||
|
Loading…
Reference in New Issue
Block a user