summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-23 11:56:44 -0800
committerGitHub <noreply@github.com>2018-01-23 11:56:44 -0800
commit2631694740c53bb7df1dd44d966e99591193dd93 (patch)
tree53c2f6ee94896409199bf892bc74c7c9eb618805 /inventory
parent1c9c43e886500f53e23b2ab58b67b4a271e140ac (diff)
parentc7f845f8dde3c09c5d1495cc34f5219f380bd782 (diff)
downloadopenshift-2631694740c53bb7df1dd44d966e99591193dd93.tar.gz
openshift-2631694740c53bb7df1dd44d966e99591193dd93.tar.bz2
openshift-2631694740c53bb7df1dd44d966e99591193dd93.tar.xz
openshift-2631694740c53bb7df1dd44d966e99591193dd93.zip
Merge pull request #6817 from mtnbikenc/fix-1506750
Automatic merge from submit-queue. [1506750] Ensure proper hostname check override Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506750
Diffstat (limited to 'inventory')
-rw-r--r--inventory/hosts.example6
1 files changed, 3 insertions, 3 deletions
diff --git a/inventory/hosts.example b/inventory/hosts.example
index da60b63e6..f9f331880 100644
--- a/inventory/hosts.example
+++ b/inventory/hosts.example
@@ -845,12 +845,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# See: https://github.com/nickhammond/ansible-logrotate
#logrotate_scripts=[{"name": "syslog", "path": "/var/log/cron\n/var/log/maillog\n/var/log/messages\n/var/log/secure\n/var/log/spooler\n", "options": ["daily", "rotate 7", "compress", "sharedscripts", "missingok"], "scripts": {"postrotate": "/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true"}}]
-# openshift-ansible will wait indefinitely for your input when it detects that the
+# The OpenShift-Ansible installer will fail when it detects that the
# value of openshift_hostname resolves to an IP address not bound to any local
# interfaces. This mis-configuration is problematic for any pod leveraging host
# networking and liveness or readiness probes.
-# Setting this variable to true will override that check.
-#openshift_override_hostname_check=true
+# Setting this variable to false will override that check.
+#openshift_hostname_check=true
# openshift_use_dnsmasq is deprecated. This must be true, or installs will fail
# in versions >= 3.6