From 1d70f509e30688826304e57775eabcd7b1e9afd2 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 8 Apr 2020 17:03:04 +0100
Subject: [PATCH] Perform host configuration during upgrade

This is a follow up to I001defc75d1f1e6caa9b1e11246abc6ce17c775b. To
maintain previous behaviour, and ensure we catch any host configuration
changes, we should perform host configuration during upgrade.

Change-Id: I79fcbf1efb02b7187406d3c3fccea6f200bcea69
Related-Bug: #1860161
---
 ansible/roles/elasticsearch/tasks/upgrade.yml     | 2 ++
 ansible/roles/haproxy/tasks/upgrade.yml           | 2 ++
 ansible/roles/ironic/tasks/legacy_upgrade.yml     | 2 ++
 ansible/roles/ironic/tasks/rolling_upgrade.yml    | 2 ++
 ansible/roles/multipathd/tasks/upgrade.yml        | 2 ++
 ansible/roles/neutron/tasks/legacy_upgrade.yml    | 2 ++
 ansible/roles/neutron/tasks/rolling_upgrade.yml   | 2 ++
 ansible/roles/nova-cell/tasks/rolling_upgrade.yml | 3 +++
 ansible/roles/openvswitch/tasks/upgrade.yml       | 2 ++
 9 files changed, 19 insertions(+)

diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml
index 2559d6c8b8..f2b089bed6 100644
--- a/ansible/roles/elasticsearch/tasks/upgrade.yml
+++ b/ansible/roles/elasticsearch/tasks/upgrade.yml
@@ -50,6 +50,8 @@
     volumes: "{{ service.volumes }}"
   when: inventory_hostname in groups[service.group]
 
+- include_tasks: config-host.yml
+
 - include_tasks: config.yml
 
 - name: Flush handlers
diff --git a/ansible/roles/haproxy/tasks/upgrade.yml b/ansible/roles/haproxy/tasks/upgrade.yml
index f77113291a..ad22684c4b 100644
--- a/ansible/roles/haproxy/tasks/upgrade.yml
+++ b/ansible/roles/haproxy/tasks/upgrade.yml
@@ -1,4 +1,6 @@
 ---
+- include_tasks: config-host.yml
+
 - include_tasks: config.yml
 
 - name: Stopping all slave keepalived containers
diff --git a/ansible/roles/ironic/tasks/legacy_upgrade.yml b/ansible/roles/ironic/tasks/legacy_upgrade.yml
index 20ccddc8f1..618000b321 100644
--- a/ansible/roles/ironic/tasks/legacy_upgrade.yml
+++ b/ansible/roles/ironic/tasks/legacy_upgrade.yml
@@ -1,4 +1,6 @@
 ---
+- include_tasks: config-host.yml
+
 - include_tasks: config.yml
 
 - include_tasks: bootstrap_service.yml
diff --git a/ansible/roles/ironic/tasks/rolling_upgrade.yml b/ansible/roles/ironic/tasks/rolling_upgrade.yml
index d51d506ffe..2095610d1f 100644
--- a/ansible/roles/ironic/tasks/rolling_upgrade.yml
+++ b/ansible/roles/ironic/tasks/rolling_upgrade.yml
@@ -1,4 +1,6 @@
 ---
+- include_tasks: config-host.yml
+
 # Pin release version
 - include_tasks: config.yml
   vars:
diff --git a/ansible/roles/multipathd/tasks/upgrade.yml b/ansible/roles/multipathd/tasks/upgrade.yml
index 375dcad19b..4768324898 100644
--- a/ansible/roles/multipathd/tasks/upgrade.yml
+++ b/ansible/roles/multipathd/tasks/upgrade.yml
@@ -1,4 +1,6 @@
 ---
+- include_tasks: config-host.yml
+
 - include_tasks: config.yml
 
 - name: Flush handlers
diff --git a/ansible/roles/neutron/tasks/legacy_upgrade.yml b/ansible/roles/neutron/tasks/legacy_upgrade.yml
index 403a613dca..39bd9dd029 100644
--- a/ansible/roles/neutron/tasks/legacy_upgrade.yml
+++ b/ansible/roles/neutron/tasks/legacy_upgrade.yml
@@ -1,4 +1,6 @@
 ---
+- include_tasks: config-host.yml
+
 - include_tasks: config.yml
 
 - include_tasks: config-neutron-fake.yml
diff --git a/ansible/roles/neutron/tasks/rolling_upgrade.yml b/ansible/roles/neutron/tasks/rolling_upgrade.yml
index b1dc000c1e..c0d1d38b36 100644
--- a/ansible/roles/neutron/tasks/rolling_upgrade.yml
+++ b/ansible/roles/neutron/tasks/rolling_upgrade.yml
@@ -1,4 +1,6 @@
 ---
+- include_tasks: config-host.yml
+
 - include_tasks: config.yml
 
 - include_tasks: config-neutron-fake.yml
diff --git a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
index 002e37d1da..6384901cb4 100644
--- a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
+++ b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
@@ -1,4 +1,7 @@
 ---
+# Configure host settings.
+- include_tasks: config-host.yml
+
 # Create new set of configs on nodes
 - include_tasks: config.yml
 
diff --git a/ansible/roles/openvswitch/tasks/upgrade.yml b/ansible/roles/openvswitch/tasks/upgrade.yml
index 110210a16b..60c9a99024 100644
--- a/ansible/roles/openvswitch/tasks/upgrade.yml
+++ b/ansible/roles/openvswitch/tasks/upgrade.yml
@@ -1,4 +1,6 @@
 ---
+- include_tasks: config-host.yml
+
 - include_tasks: config.yml
 
 - name: Flush Handlers
-- 
GitLab