Drop enable_host_ntp
As promised for Xena. Change-Id: Id634426a1961f0b883068e4ed80e7d1633e5708e
This commit is contained in:
parent
7b8332e1aa
commit
9dee2a92d8
@ -24,10 +24,6 @@ create_kolla_user_sudoers: "{{ create_kolla_user }}"
|
|||||||
kolla_user: "kolla"
|
kolla_user: "kolla"
|
||||||
kolla_group: "kolla"
|
kolla_group: "kolla"
|
||||||
|
|
||||||
# Deprecated since Wallaby. To be dropped in Xena.
|
|
||||||
# Please use other means of configuring NTP.
|
|
||||||
enable_host_ntp: False
|
|
||||||
|
|
||||||
change_selinux: True
|
change_selinux: True
|
||||||
|
|
||||||
selinux_state: "permissive"
|
selinux_state: "permissive"
|
||||||
@ -52,7 +48,6 @@ debian_pkg_install:
|
|||||||
- "python3-setuptools"
|
- "python3-setuptools"
|
||||||
- "python3-pip"
|
- "python3-pip"
|
||||||
- "{% if virtualenv is not none %}python3-virtualenv{% endif %}"
|
- "{% if virtualenv is not none %}python3-virtualenv{% endif %}"
|
||||||
- "{% if enable_host_ntp | bool %}ntp{% endif %}"
|
|
||||||
- "{% if enable_multipathd|bool %}sg3-utils-udev{% endif %}"
|
- "{% if enable_multipathd|bool %}sg3-utils-udev{% endif %}"
|
||||||
- "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}"
|
- "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}"
|
||||||
|
|
||||||
@ -61,7 +56,6 @@ redhat_pkg_install:
|
|||||||
- git
|
- git
|
||||||
- "python3-pip"
|
- "python3-pip"
|
||||||
- "{% if virtualenv is not none %}python3-virtualenv{% endif %}"
|
- "{% if virtualenv is not none %}python3-virtualenv{% endif %}"
|
||||||
- "{% if enable_host_ntp | bool %}ntp{% endif %}"
|
|
||||||
- sudo
|
- sudo
|
||||||
- "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}"
|
- "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}"
|
||||||
|
|
||||||
|
@ -243,56 +243,6 @@
|
|||||||
masked: no
|
masked: no
|
||||||
become: True
|
become: True
|
||||||
|
|
||||||
- name: Warn about deprecations
|
|
||||||
debug:
|
|
||||||
msg: >
|
|
||||||
enable_host_ntp is deprecated.
|
|
||||||
Please configure NTP using a different tool.
|
|
||||||
when: enable_host_ntp | bool
|
|
||||||
|
|
||||||
- name: Stop time service
|
|
||||||
service:
|
|
||||||
name: ntp
|
|
||||||
state: stopped
|
|
||||||
become: True
|
|
||||||
when:
|
|
||||||
- ansible_facts.os_family == "Debian"
|
|
||||||
- enable_host_ntp | bool
|
|
||||||
|
|
||||||
- name: Stop time service
|
|
||||||
service:
|
|
||||||
name: ntpd
|
|
||||||
state: stopped
|
|
||||||
become: True
|
|
||||||
when:
|
|
||||||
- ansible_facts.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:
|
|
||||||
name: ntp
|
|
||||||
state: started
|
|
||||||
enabled: yes
|
|
||||||
become: True
|
|
||||||
when:
|
|
||||||
- ansible_facts.os_family == "Debian"
|
|
||||||
- enable_host_ntp | bool
|
|
||||||
|
|
||||||
- name: Start time sync service
|
|
||||||
service:
|
|
||||||
name: ntpd
|
|
||||||
state: started
|
|
||||||
enabled: yes
|
|
||||||
become: True
|
|
||||||
when:
|
|
||||||
- ansible_facts.os_family == "RedHat"
|
|
||||||
- enable_host_ntp | bool
|
|
||||||
|
|
||||||
- name: Change state of selinux
|
- name: Change state of selinux
|
||||||
selinux:
|
selinux:
|
||||||
policy: targeted
|
policy: targeted
|
||||||
|
@ -230,14 +230,3 @@ Configuration of SELinux
|
|||||||
On Red Hat family systems, if ``change_selinux`` is set (default is ``true``),
|
On Red Hat family systems, if ``change_selinux`` is set (default is ``true``),
|
||||||
then the SELinux state will be set to ``selinux_state`` (default
|
then the SELinux state will be set to ``selinux_state`` (default
|
||||||
``permissive``). See :doc:`../../user/security` for further information.
|
``permissive``). See :doc:`../../user/security` for further information.
|
||||||
|
|
||||||
Configuration of NTP daemon
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
.. warning::
|
|
||||||
Support for configuration of NTP daemon is deprecated and will be removed in
|
|
||||||
the next Kolla Ansible release (Xena).
|
|
||||||
Please use other means of configuring NTP.
|
|
||||||
|
|
||||||
This is optional, and enabled by ``enable_host_ntp``, which is ``false`` by
|
|
||||||
default.
|
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
``enable_host_ntp`` variable is dropped per the deprecation process.
|
Loading…
x
Reference in New Issue
Block a user