Merge branch 'master' into rm_origin-components

2 files changed, 3 insertions, 3 deletions

diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index a85a43bd3..eb42721b5 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -820,7 +820,7 @@ http://docs.openshift.com/enterprise/latest/admin_guide/overview.html
         click.echo(message)
 
 
-@click.group()
+@click.group(context_settings=dict(max_content_width=120))
 @click.pass_context
 @click.option('--unattended', '-u', is_flag=True, default=False)
 @click.option('--configuration', '-c',
@@ -932,7 +932,7 @@ def uninstall(ctx):
     openshift_ansible.run_uninstall_playbook(hosts, verbose)
 
 
-@click.command()
+@click.command(context_settings=dict(max_content_width=120))
 @click.option('--latest-minor', '-l', is_flag=True, default=False)
 @click.option('--next-major', '-n', is_flag=True, default=False)
 @click.pass_context
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 216664cd0..84a76fa53 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -122,7 +122,7 @@ def write_inventory_vars(base_inventory, lb):
     if CFG.deployment.variables['ansible_ssh_user'] != 'root':
         base_inventory.write('ansible_become=yes\n')
 
-    base_inventory.write('openshift_override_hostname_check=true\n')
+    base_inventory.write('openshift_hostname_check=false\n')
 
     if lb is not None:
         base_inventory.write("openshift_master_cluster_hostname={}\n".format(lb.hostname))