diff --git a/etc/openstack_deploy/conf.d/swift-remote.yml.sample b/etc/openstack_deploy/conf.d/swift-remote.yml.sample
index 81a336178f..f694931525 100644
--- a/etc/openstack_deploy/conf.d/swift-remote.yml.sample
+++ b/etc/openstack_deploy/conf.d/swift-remote.yml.sample
@@ -2,7 +2,7 @@
 # For remote swift hosts you will only specify the IP address
 # NB. The ip address that must be specified is the IP address that swift
 # hosts will be able to replicate on and not necessarily the
-# ansible_ssh_host IP from the remote ansible install.
+# ansible_ssh IP from the remote ansible install.
 swift-remote_hosts:
   remote-swift1:
     ip: 172.29.237.1
diff --git a/lib/manage.py b/lib/manage.py
index acdcb0fc2e..447c188854 100644
--- a/lib/manage.py
+++ b/lib/manage.py
@@ -249,7 +249,7 @@ def print_inventory(inventory, sort_key):
         'component',
         'physical_host',
         'tunnel_address',
-        'ansible_ssh_host',
+        'ansible_host',
         'container_types'
     ]
     table = prettytable.PrettyTable(required_list)
diff --git a/scripts/upgrade-utilities/playbooks/galera-cluster-rolling-restart.yml b/scripts/upgrade-utilities/playbooks/galera-cluster-rolling-restart.yml
index fb2f1a146b..f63f4c415c 100644
--- a/scripts/upgrade-utilities/playbooks/galera-cluster-rolling-restart.yml
+++ b/scripts/upgrade-utilities/playbooks/galera-cluster-rolling-restart.yml
@@ -44,7 +44,7 @@
       local_action:
         module: wait_for
         port: "3306"
-        host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
+        host: "{{ ansible_host | default(ansible_ssh_host | default(inventory_hostname)) }}"
       retries: 10
       delay: 10