summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-23 23:36:08 -0400
committerJhon Honce <jhonce@redhat.com>2015-03-24 11:29:44 -0700
commitde1391db4309f020b5c8467597eef527b560bbaa (patch)
treee27f08771e8004e4d60ddbe3db8de4ba55ec0185
parentd67c5b8f79609d2d3b07cc009f58e3dc988782c5 (diff)
downloadopenshift-de1391db4309f020b5c8467597eef527b560bbaa.tar.gz
openshift-de1391db4309f020b5c8467597eef527b560bbaa.tar.bz2
openshift-de1391db4309f020b5c8467597eef527b560bbaa.tar.xz
openshift-de1391db4309f020b5c8467597eef527b560bbaa.zip
remove openshift_hostname_workaround var for openshift_common, rather rely on inventory/playbook variables for openshift_hostname
-rw-r--r--roles/openshift_common/README.md1
-rw-r--r--roles/openshift_common/defaults/main.yml5
-rw-r--r--roles/openshift_master/README.md1
-rw-r--r--roles/openshift_node/README.md1
-rw-r--r--roles/openshift_sdn_node/README.md1
5 files changed, 0 insertions, 9 deletions
diff --git a/roles/openshift_common/README.md b/roles/openshift_common/README.md
index 592a276f9..880d66e2c 100644
--- a/roles/openshift_common/README.md
+++ b/roles/openshift_common/README.md
@@ -15,7 +15,6 @@ 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 | 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 86351f6f6..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
-
diff --git a/roles/openshift_master/README.md b/roles/openshift_master/README.md
index 2f03b4990..2d898bc3b 100644
--- a/roles/openshift_master/README.md
+++ b/roles/openshift_master/README.md
@@ -25,7 +25,6 @@ From openshift_common:
| Name | Default Value | |
|-------------------------------|---------------------|---------------------|
| openshift_debug_level | 0 | Global openshift debug log verbosity |
-| openshift_hostname_workaround | True | |
| openshift_public_ip | UNDEF (Required) | Public IP address to use for this host |
| openshift_hostname | UNDEF (Required) | hostname to use for this instance |
diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md
index d537a35a5..c9b4eab34 100644
--- a/roles/openshift_node/README.md
+++ b/roles/openshift_node/README.md
@@ -26,7 +26,6 @@ From openshift_common:
| Name | Default Value | |
|-------------------------------|---------------------|---------------------|
| openshift_debug_level | 0 | Global openshift debug log verbosity |
-| openshift_hostname_workaround | True | |
| openshift_public_ip | UNDEF (Required) | Public IP address to use for this host |
| openshift_hostname | UNDEF (Required) | hostname to use for this instance |
diff --git a/roles/openshift_sdn_node/README.md b/roles/openshift_sdn_node/README.md
index 33197c241..2da2d74eb 100644
--- a/roles/openshift_sdn_node/README.md
+++ b/roles/openshift_sdn_node/README.md
@@ -27,7 +27,6 @@ From openshift_common:
| Name | Default value | |
|-------------------------------|---------------------|----------------------------------------|
| openshift_debug_level | 0 | Global openshift debug log verbosity |
-| openshift_hostname_workaround | True | |
| openshift_public_ip | UNDEF (Required) | Public IP address to use for this host |
| openshift_hostname | UNDEF (Required) | hostname to use for this instance |