From ef6df7220673de40d1c9854e105d7f134232e733 Mon Sep 17 00:00:00 2001
From: Samuel Munilla <smunilla@redhat.com>
Date: Fri, 30 Oct 2015 13:01:09 -0400
Subject: ooinstall: Update local install check
Update to check both hostname and public_hostname.
Remove ansible_sudo=no as I failed to notice we were already checking
if ansible_ssh_user == 'root' and setting it there.
---
utils/src/ooinstall/openshift_ansible.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'utils/src')
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index bb1003ad6..4c9d30718 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -44,9 +44,9 @@ def generate_inventory(hosts):
if 'OO_INSTALL_STAGE_REGISTRY' in os.environ:
base_inventory.write('oreg_url=registry.access.stage.redhat.com/openshift3/ose-${component}:${version}\n')
- if any(host.hostname == installer_host for host in hosts):
+ if any(host.hostname == installer_host or host.public_hostname == installer_host
+ for host in hosts):
base_inventory.write("ansible_connection=local\n")
- base_inventory.write("ansible_sudo=no\n")
base_inventory.write('\n[masters]\n')
masters = (host for host in hosts if host.master)
--
cgit v1.2.3