summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2015-10-30 13:01:09 -0400
committerSamuel Munilla <smunilla@redhat.com>2015-11-03 11:42:58 -0500
commitef6df7220673de40d1c9854e105d7f134232e733 (patch)
treea21636572c73fa2ce38774a53a771119fc1644db
parentb41bca63682e11e2522540567c2bcf1d146e5d03 (diff)
downloadopenshift-ef6df7220673de40d1c9854e105d7f134232e733.tar.gz
openshift-ef6df7220673de40d1c9854e105d7f134232e733.tar.bz2
openshift-ef6df7220673de40d1c9854e105d7f134232e733.tar.xz
openshift-ef6df7220673de40d1c9854e105d7f134232e733.zip
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.
-rw-r--r--utils/src/ooinstall/openshift_ansible.py4
1 files changed, 2 insertions, 2 deletions
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)