diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-23 11:56:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 11:56:44 -0800 |
| commit | 2631694740c53bb7df1dd44d966e99591193dd93 (patch) | |
| tree | 53c2f6ee94896409199bf892bc74c7c9eb618805 /playbooks | |
| parent | 1c9c43e886500f53e23b2ab58b67b4a271e140ac (diff) | |
| parent | c7f845f8dde3c09c5d1495cc34f5219f380bd782 (diff) | |
| download | openshift-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 'playbooks')
| -rw-r--r-- | playbooks/init/validate_hostnames.yml | 4 | ||||
| -rw-r--r-- | playbooks/openstack/sample-inventory/group_vars/OSEv3.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/init/validate_hostnames.yml b/playbooks/init/validate_hostnames.yml index 86e0b2416..b49f7dd08 100644 --- a/playbooks/init/validate_hostnames.yml +++ b/playbooks/init/validate_hostnames.yml @@ -25,7 +25,7 @@ when: - lookupip.stdout != '127.0.0.1' - lookupip.stdout not in ansible_all_ipv4_addresses - - openshift_hostname_check | default(true) + - openshift_hostname_check | default(true) | bool - name: Validate openshift_ip exists on node when defined fail: @@ -40,4 +40,4 @@ when: - openshift_ip is defined - openshift_ip not in ansible_all_ipv4_addresses - - openshift_ip_check | default(true) + - openshift_ip_check | default(true) | bool diff --git a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml index a8663f946..1287b25f3 100644 --- a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml +++ b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml @@ -43,7 +43,7 @@ openshift_hosted_registry_wait: True # NOTE(shadower): the hostname check seems to always fail because the # host's floating IP address doesn't match the address received from # inside the host. -openshift_override_hostname_check: true +openshift_hostname_check: false # For POCs or demo environments that are using smaller instances than # the official recommended values for RAM and DISK, uncomment the line below. |