diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-03-24 14:16:31 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-03-24 14:16:31 -0700 |
| commit | f2f0167b605b541ad74d0aef0392609772692f0d (patch) | |
| tree | 8f377eaba382dc1515a050068e5c3fa83c5106ea /roles/openshift_common | |
| parent | 43ed89371aa2fce56d5e2b41af35a3ae902e92e6 (diff) | |
| parent | 4dc8ca74f47bcbe0fd6285b0d73cc5b193be17a9 (diff) | |
| download | openshift-f2f0167b605b541ad74d0aef0392609772692f0d.tar.gz openshift-f2f0167b605b541ad74d0aef0392609772692f0d.tar.bz2 openshift-f2f0167b605b541ad74d0aef0392609772692f0d.tar.xz openshift-f2f0167b605b541ad74d0aef0392609772692f0d.zip | |
Merge pull request #97 from jwhonce/wip/cluster
Use ansible playbook to initialize openshift cluster
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/README.md | 3 | ||||
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/roles/openshift_common/README.md b/roles/openshift_common/README.md index fce79047c..880d66e2c 100644 --- a/roles/openshift_common/README.md +++ b/roles/openshift_common/README.md @@ -15,8 +15,7 @@ Role Variables | Name | Default value | | |-------------------------------|------------------------------|----------------------------------------| | openshift_debug_level | 0 | Global openshift debug log verbosity | -| openshift_hostname_workaround | True | Workaround needed to set hostname to IP address | -| openshift_hostname | openshift_public_ip if openshift_hostname_workaround else ansible_fqdn | hostname to use for this instance | +| openshift_hostname | UNDEF (Required) | hostname to use for this instance | | openshift_public_ip | UNDEF (Required) | Public IP address to use for this host | | openshift_env | default | Envrionment name if multiple OpenShift instances | diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index eb6edbc03..22b2c6ffd 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -1,7 +1,2 @@ --- openshift_debug_level: 0 - -# TODO: Once openshift stops resolving hostnames for node queries remove -# this... -openshift_hostname_workaround: true -openshift_hostname: "{{ ansible_default_ipv4.address if openshift_hostname_workaround else ansible_fqdn }}" |