diff options
author | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
---|---|---|
committer | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
commit | 8cbd53ed64f1819b8f4defbf196140a1692c5a42 (patch) | |
tree | 7dd61610e8ea6ae373e12dbb1c894047b8feac0f /utils | |
parent | c2de775c80b8daa629af514f24118f704c521c18 (diff) | |
parent | 0b57e113dbf16b5ac6f01859c9c4ab2aee594f87 (diff) | |
download | openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.gz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.bz2 openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.xz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.zip |
Merge branch 'master' into rm_origin-components
Diffstat (limited to 'utils')
-rw-r--r-- | utils/src/ooinstall/cli_installer.py | 4 | ||||
-rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 2 |
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)) |