From 1d0171fc708c87ba73c0726f294b66df49e63cfb Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 1 Oct 2021 14:06:10 +0100
Subject: [PATCH] monasca: change default of monasca_ntp_server

Updates the default value of 'monasca_ntp_server' from
'external_ntp_servers[0]' to '0.pool.ntp.org'.  This is due to the
removal of the 'external_ntp_servers' variable as part of the removal of
Chrony deployment.

Change-Id: I2e7538a2e95c7b8e9280eb051ee634b4313db129
---
 ansible/roles/monasca/defaults/main.yml                    | 2 +-
 .../notes/monasca-collector-ntp-6be55e5526438cfc.yaml      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/monasca-collector-ntp-6be55e5526438cfc.yaml

diff --git a/ansible/roles/monasca/defaults/main.yml b/ansible/roles/monasca/defaults/main.yml
index 28cb89968b..480d13947e 100644
--- a/ansible/roles/monasca/defaults/main.yml
+++ b/ansible/roles/monasca/defaults/main.yml
@@ -138,7 +138,7 @@ monasca_memcached_servers: "{% for host in groups['memcached'] %}{{ 'api' | koll
 monasca_elasticsearch_servers: "{% for host in groups['elasticsearch'] %}'{{ internal_protocol }}://{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ elasticsearch_port }}'{% if not loop.last %},{% endif %}{% endfor %}"
 monasca_storm_nimbus_servers: "{% for host in groups['storm-nimbus'] %}'{{ 'api' | kolla_address(host) }}'{% if not loop.last %},{% endif %}{% endfor %}"
 # NOTE(dszumski): Only one NTP server is currently supported by the Monasca Agent plugin
-monasca_ntp_server: "{{ external_ntp_servers | first }}"
+monasca_ntp_server: "0.pool.ntp.org"
 
 # The default number of Kafka topic partitions. This effectively limits
 # the maximum number of workers per topic, counted over all nodes in the
diff --git a/releasenotes/notes/monasca-collector-ntp-6be55e5526438cfc.yaml b/releasenotes/notes/monasca-collector-ntp-6be55e5526438cfc.yaml
new file mode 100644
index 0000000000..819a1d9f3f
--- /dev/null
+++ b/releasenotes/notes/monasca-collector-ntp-6be55e5526438cfc.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Updates the default value of ``monasca_ntp_server`` from
+    ``external_ntp_servers[0]`` to ``0.pool.ntp.org``.  This is due to the
+    removal of the ``external_ntp_servers`` variable as part of the removal of
+    Chrony deployment.