Merge "Deprecate and disable chrony by default"

ansible/group_vars/all.yml

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

ansible/roles/chrony/tasks/main.yml

@@ -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"

doc/source/reference/logging-and-monitoring/monasca-guide.rst

@@ -173,7 +173,7 @@ images:
 
 .. 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
 ~~~~~~~~~~

etc/kolla/globals.yml

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

releasenotes/notes/deprecate-chrony-077a8686e79a919e.yaml

@@ -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.

tests/setup_gate.sh

@@ -49,7 +49,7 @@ function prepare_images {
     fi
 
     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
         GATE_IMAGES="bifrost"
     fi

tests/templates/globals-default.j2

@@ -33,6 +33,12 @@ enable_openstack_core: "{{ openstack_core_enabled }}"
 enable_horizon: "{{ dashboard_enabled }}"
 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' %}
 kolla_internal_vip_address: "{{ kolla_internal_vip_address }}"
 neutron_external_interface: "{{ neutron_external_interface_name }}"
@@ -107,7 +113,6 @@ enable_cells: "yes"
 {% endif %}
 
 {% if scenario == "mariadb" %}
-enable_chrony: "no"
 enable_fluentd: "yes"
 enable_mariadb: "yes"
 enable_memcached: "no"
@@ -115,8 +120,6 @@ enable_rabbitmq: "no"
 {% endif %}
 
 {% if scenario == "cephadm" %}
-# Disable chrony - cephadm requires chronyd.service running
-enable_chrony: "no"
 # kolla-ansible vars
 enable_cinder: "yes"
 # External Ceph
@@ -156,7 +159,6 @@ enable_octavia: "yes"
 {% endif %}
 
 {% if scenario == "prometheus-efk" %}
-enable_chrony: "no"
 enable_central_logging: "yes"
 enable_grafana: "yes"
 enable_prometheus: "yes"