Deprecate and disable chrony by default

Per [1].

[1] http://lists.openstack.org/pipermail/openstack-discuss/2021-February/020707.html

Change-Id: Id6f3cd158bf5d01750971249b11364b6a8631789
Closes-Bug: #1885689
This commit is contained in:
Radosław Piliszek 2020-07-12 10:35:31 +02:00 committed by Mark Goddard
parent a52cf61b22
commit b647cb4128
7 changed files with 24 additions and 8 deletions

View File

@ -580,7 +580,7 @@ enable_ceilometer: "no"
enable_ceilometer_ipmi: "no" enable_ceilometer_ipmi: "no"
enable_cells: "no" enable_cells: "no"
enable_central_logging: "no" enable_central_logging: "no"
enable_chrony: "yes" enable_chrony: "no"
enable_cinder: "no" enable_cinder: "no"
enable_cinder_backup: "yes" enable_cinder_backup: "yes"
enable_cinder_backend_hnas_nfs: "no" enable_cinder_backend_hnas_nfs: "no"

View File

@ -1,2 +1,7 @@
--- ---
- name: Warn about deprecation
debug:
msg: >
chrony role is deprecated and will be removed in Xena
- include_tasks: "{{ kolla_action }}.yml" - include_tasks: "{{ kolla_action }}.yml"

View File

@ -173,7 +173,7 @@ images:
.. code-block:: console .. code-block:: console
$ kolla-build cron chrony fluentd mariadb kolla-toolbox keystone memcached keepalived haproxy $ kolla-build cron fluentd mariadb kolla-toolbox keystone memcached keepalived haproxy
Deployment Deployment
~~~~~~~~~~ ~~~~~~~~~~

View File

@ -274,7 +274,7 @@
#enable_ceilometer_ipmi: "no" #enable_ceilometer_ipmi: "no"
#enable_cells: "no" #enable_cells: "no"
#enable_central_logging: "no" #enable_central_logging: "no"
#enable_chrony: "yes" #enable_chrony: "no"
#enable_cinder: "no" #enable_cinder: "no"
#enable_cinder_backup: "yes" #enable_cinder_backup: "yes"
#enable_cinder_backend_hnas_nfs: "no" #enable_cinder_backend_hnas_nfs: "no"

View File

@ -0,0 +1,9 @@
---
deprecations:
- |
Support for deploying ``chrony`` is deprecated and will be removed in the
Xena cycle.
upgrade:
- |
Due to deprecation, ``chrony`` is no longer enabled by default.

View File

@ -49,7 +49,7 @@ function prepare_images {
fi fi
if [[ $SCENARIO != "bifrost" ]]; then if [[ $SCENARIO != "bifrost" ]]; then
GATE_IMAGES="^cron,^fluentd,^glance,^haproxy,^keepalived,^keystone,^kolla-toolbox,^mariadb,^memcached,^neutron,^nova-,^openvswitch,^rabbitmq,^horizon,^chrony,^heat,^placement" GATE_IMAGES="^cron,^fluentd,^glance,^haproxy,^keepalived,^keystone,^kolla-toolbox,^mariadb,^memcached,^neutron,^nova-,^openvswitch,^rabbitmq,^horizon,^heat,^placement"
else else
GATE_IMAGES="bifrost" GATE_IMAGES="bifrost"
fi fi

View File

@ -33,6 +33,12 @@ enable_openstack_core: "{{ openstack_core_enabled }}"
enable_horizon: "{{ dashboard_enabled }}" enable_horizon: "{{ dashboard_enabled }}"
enable_heat: "{{ openstack_core_tested }}" enable_heat: "{{ openstack_core_tested }}"
# TODO(yoctozepto): Remove this in the Xena cycle.
# We have to keep it for now for upgrades because dropping chronyd inbetween
# will make prechecks fail due to lack of proper host-level timesync (chronyd
# is containerized and the host-level client either removed or fought with).
enable_chrony: "no"
{% if scenario != 'bifrost' %} {% if scenario != 'bifrost' %}
kolla_internal_vip_address: "{{ kolla_internal_vip_address }}" kolla_internal_vip_address: "{{ kolla_internal_vip_address }}"
neutron_external_interface: "{{ neutron_external_interface_name }}" neutron_external_interface: "{{ neutron_external_interface_name }}"
@ -105,7 +111,6 @@ enable_cells: "yes"
{% endif %} {% endif %}
{% if scenario == "mariadb" %} {% if scenario == "mariadb" %}
enable_chrony: "no"
enable_fluentd: "yes" enable_fluentd: "yes"
enable_mariadb: "yes" enable_mariadb: "yes"
enable_memcached: "no" enable_memcached: "no"
@ -113,8 +118,6 @@ enable_rabbitmq: "no"
{% endif %} {% endif %}
{% if scenario == "cephadm" %} {% if scenario == "cephadm" %}
# Disable chrony - cephadm requires chronyd.service running
enable_chrony: "no"
# kolla-ansible vars # kolla-ansible vars
enable_cinder: "yes" enable_cinder: "yes"
# External Ceph # External Ceph
@ -154,7 +157,6 @@ enable_octavia: "yes"
{% endif %} {% endif %}
{% if scenario == "prometheus-efk" %} {% if scenario == "prometheus-efk" %}
enable_chrony: "no"
enable_central_logging: "yes" enable_central_logging: "yes"
enable_grafana: "yes" enable_grafana: "yes"
enable_prometheus: "yes" enable_prometheus: "yes"