diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml
index 2559d6c8b8e9bf555fe9926a4281ce1162cccda7..f2b089bed656c71ec88270acc72b278fbff637bd 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 f77113291a4b17f92a7e32e094d79b4681525596..ad22684c4b1061bf8828ab5fd74cf64c7504c132 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 20ccddc8f19214e1b759358121c9bcd010eac69b..618000b3213f1ac2ff60e9da720134d632b198cc 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 d51d506ffe965eb293d3531a9aac6f074e93f710..2095610d1fdaaa0b358caf04db568e9a7e4202e3 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 375dcad19b188093ce043545f95307dcaab172dd..47683248986b68ab1374c7ef990e66fe3bfddfe8 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 403a613dcac84f7d749828beee420897c24e915a..39bd9dd029f4e3d31d170109334363e361153811 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 b1dc000c1ef8c29b077a727fdcf5a86bb07e984b..c0d1d38b364005d685c9238edcd717a46afba5dd 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 002e37d1da0ffe58d9929d94663781efbfa54052..6384901cb4545b2d3b2632eff5b7ea03b1835254 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 110210a16b37a4124f086e300b7953cc96c2041f..60c9a99024b265a5e4536cc65910e6d7d2ece100 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