From ffc4ce40316acfccf1e36a9bca27c52819853e2a Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Wed, 30 Sep 2015 13:22:45 -0400
Subject: Use lower() filter for node hostname

---
 roles/openshift_manage_node/tasks/main.yml     | 6 +++---
 roles/openshift_node/templates/node.yaml.v1.j2 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'roles')

diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index 7c4f45ce6..c6c7cd49e 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: Wait for Node Registration
   command: >
-      {{ openshift.common.client_binary }} get node {{ item }}
+      {{ openshift.common.client_binary }} get node {{ item | lower }}
   register: omd_get_node
   until: omd_get_node.rc == 0
   retries: 10
@@ -9,13 +9,13 @@
 
 - name: Set node schedulability
   command: >
-    {{ openshift.common.admin_binary }} manage-node {{ item.openshift.common.hostname }} --schedulable={{ 'true' if item.openshift.node.schedulable | bool else 'false' }}
+    {{ openshift.common.admin_binary }} manage-node {{ item.openshift.common.hostname | lower }} --schedulable={{ 'true' if item.openshift.node.schedulable | bool else 'false' }}
   with_items:
     -  "{{ openshift_node_vars }}"
 
 - name: Label nodes
   command: >
-    {{ openshift.common.client_binary }} label --overwrite node {{ item.openshift.common.hostname }} {{ item.openshift.node.labels | oo_combine_dict  }}
+    {{ openshift.common.client_binary }} label --overwrite node {{ item.openshift.common.hostname | lower }} {{ item.openshift.node.labels | oo_combine_dict  }}
   with_items:
     -  "{{ openshift_node_vars }}"
   when: "'labels' in item.openshift.node and item.openshift.node.labels != {}"
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 07d80f99b..946c0b655 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -18,7 +18,7 @@ networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
 networkConfig:
    mtu: {{ openshift.node.sdn_mtu }}
    networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
-nodeName: {{ openshift.common.hostname }}
+nodeName: {{ openshift.common.hostname | lower }}
 podManifestConfig:
 servingInfo:
   bindAddress: 0.0.0.0:10250
-- 
cgit v1.2.3