summaryrefslogtreecommitdiffstats
path: root/roles/openshift_register_nodes
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-06-04 14:34:27 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-06-10 11:45:04 -0400
commit5176446e148679e7a75119a1bfe9088262365ff9 (patch)
tree9a1e9748774d5583b401da69961d38ab872c6ef4 /roles/openshift_register_nodes
parent94a77cb1d81b6e4e316ae679890df4994816532f (diff)
downloadopenshift-5176446e148679e7a75119a1bfe9088262365ff9.tar.gz
openshift-5176446e148679e7a75119a1bfe9088262365ff9.tar.bz2
openshift-5176446e148679e7a75119a1bfe9088262365ff9.tar.xz
openshift-5176446e148679e7a75119a1bfe9088262365ff9.zip
Bugfixes
- Don't include ./ in the tarball we transfer to the nodes - Fixup node argument ordering
Diffstat (limited to 'roles/openshift_register_nodes')
-rwxr-xr-xroles/openshift_register_nodes/library/kubernetes_register_node.py2
-rw-r--r--roles/openshift_register_nodes/tasks/main.yml1
2 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_register_nodes/library/kubernetes_register_node.py b/roles/openshift_register_nodes/library/kubernetes_register_node.py
index ee24d4166..a8c38627b 100755
--- a/roles/openshift_register_nodes/library/kubernetes_register_node.py
+++ b/roles/openshift_register_nodes/library/kubernetes_register_node.py
@@ -335,7 +335,7 @@ class Node(object):
if self.node['apiVersion'] == 'v1beta1':
return self.node['id']
elif self.node['apiVersion'] == 'v1beta3':
- return self.node['name']
+ return self.node['metadata']['name']
def get_node(self):
""" Get the dict representing the node
diff --git a/roles/openshift_register_nodes/tasks/main.yml b/roles/openshift_register_nodes/tasks/main.yml
index b78e00a98..11097a7cf 100644
--- a/roles/openshift_register_nodes/tasks/main.yml
+++ b/roles/openshift_register_nodes/tasks/main.yml
@@ -48,4 +48,3 @@
annotations: "{{ item.openshift.node.annotations | default({}) }}"
with_items: openshift_nodes
register: register_result
-