From 8da5472ea84729334b4911080b00cf8929f3111e Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 1 Dec 2023 13:02:19 +0100
Subject: [PATCH] Remove kolla_enable_host_ntp variable
This variable was configuring enable_host_ntp in kolla-ansible, which
was removed in the Xena release.
Change-Id: I737598d3bbe40b933b4b727eccc3b2a76ed97cdb
---
ansible/kolla-ansible.yml | 1 -
ansible/roles/kolla-ansible/defaults/main.yml | 6 ------
ansible/roles/kolla-ansible/templates/kolla/globals.yml | 4 ----
3 files changed, 11 deletions(-)
diff --git a/ansible/kolla-ansible.yml b/ansible/kolla-ansible.yml
index a31ec64d..b4d5126d 100644
--- a/ansible/kolla-ansible.yml
+++ b/ansible/kolla-ansible.yml
@@ -108,7 +108,6 @@
kolla_inspector_default_gateway: "{{ inspection_net_name | net_inspection_gateway or inspection_net_name | net_gateway }}"
kolla_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}"
kolla_libvirt_tls: "{{ compute_libvirt_enable_tls | bool }}"
- kolla_enable_host_ntp: false
kolla_globals_paths_static:
- "{{ kayobe_config_path }}"
kolla_globals_paths_extra: "{{ kolla_globals_paths_static + kayobe_env_search_paths }}"
diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml
index a4044aa5..e95a2074 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -298,12 +298,6 @@ kolla_internal_tls_cert:
# Desired SELinux state.
kolla_selinux_state:
-###############################################################################
-# NTP
-
-# Whether to enable the NTP daemon.
-kolla_enable_host_ntp:
-
###############################################################################
# Docker configuration.
diff --git a/ansible/roles/kolla-ansible/templates/kolla/globals.yml b/ansible/roles/kolla-ansible/templates/kolla/globals.yml
index 1d833b93..643a9e95 100644
--- a/ansible/roles/kolla-ansible/templates/kolla/globals.yml
+++ b/ansible/roles/kolla-ansible/templates/kolla/globals.yml
@@ -527,10 +527,6 @@ grafana_admin_username: "{{ grafana_local_admin_user_name }}"
selinux_state: {{ kolla_selinux_state }}
{% endif %}
-{% if kolla_enable_host_ntp is not none %}
-enable_host_ntp: {{ kolla_enable_host_ntp | bool }}
-{% endif %}
-
# Kayobe performs creation of the Kolla Ansible user account, so there is no
# need for Kolla Ansible to repeat this.
create_kolla_user: false
--
GitLab