summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/templates
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-24 14:29:14 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-24 14:29:14 -0500
commit4591db0eb0ac70599293fbbce65cf402e0ec1bc1 (patch)
tree4a806c541d9738b708d9319ace64cb21f51ce682 /roles/openshift_node/templates
parentf464177c264ef87af80ac023e2698a466b723325 (diff)
parent42232eb59cc3c6ae5d4733b6655add0aff23217b (diff)
downloadopenshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.tar.gz
openshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.tar.bz2
openshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.tar.xz
openshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.zip
Merge pull request #970 from detiber/nodeIP
Conditionally set the nodeIP
Diffstat (limited to 'roles/openshift_node/templates')
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 7d2f506e3..41a303dee 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -23,7 +23,9 @@ networkConfig:
{% if openshift.common.use_openshift_sdn %}
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
{% endif %}
+{% if openshift.node.set_node_ip | bool %}
nodeIP: {{ openshift.common.ip }}
+{% endif %}
nodeName: {{ openshift.common.hostname | lower }}
podManifestConfig:
servingInfo: