diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
| commit | 7f7b582a7bc239e69c147b98c8c2512050f12851 (patch) | |
| tree | f0701e3ce7a42761e9dfb59218057a46e48a901b /roles/openshift_common/defaults | |
| parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
| parent | 0722304b2f9c94a2f70054e0a3c7feceaedb195c (diff) | |
| download | openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.gz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.bz2 openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.xz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.zip | |
Merge pull request #158 from openshift/master
Merge master into INT for first v3 INT deploy
Diffstat (limited to 'roles/openshift_common/defaults')
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index a541591fb..4d3e0fe9e 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -1,8 +1,3 @@ --- -openshift_bind_ip: "{{ ansible_default_ipv4.address }}" +openshift_cluster_id: 'default' openshift_debug_level: 0 - -# TODO: Once openshift stops resolving hostnames for node queries remove -# this... -openshift_hostname_workaround: true -openshift_hostname: "{{ openshift_public_ip if openshift_hostname_workaround else ansible_fqdn }}" |