summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-24 14:06:12 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-24 14:06:12 -0500
commit42232eb59cc3c6ae5d4733b6655add0aff23217b (patch)
tree0d3de9588c0fa5c4ea764b2b3ae93d13dea19b8f /roles/openshift_node
parentcb3da200563684c15d3a65cb2bf3958b9a34b249 (diff)
downloadopenshift-42232eb59cc3c6ae5d4733b6655add0aff23217b.tar.gz
openshift-42232eb59cc3c6ae5d4733b6655add0aff23217b.tar.bz2
openshift-42232eb59cc3c6ae5d4733b6655add0aff23217b.tar.xz
openshift-42232eb59cc3c6ae5d4733b6655add0aff23217b.zip
Conditionally set the nodeIP
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/main.yml1
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j22
2 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index d11bc5123..42d984a09 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -34,6 +34,7 @@
schedulable: "{{ openshift_schedulable | default(openshift_scheduleable) | default(None) }}"
sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
storage_plugin_deps: "{{ osn_storage_plugin_deps | default(None) }}"
+ set_node_ip: "{{ openshift_set_node_ip | default(None) }}"
# We have to add tuned-profiles in the same transaction otherwise we run into depsolving
# problems because the rpms don't pin the version properly.
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: