diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-06-04 14:34:27 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-06-10 11:45:04 -0400 |
| commit | 5176446e148679e7a75119a1bfe9088262365ff9 (patch) | |
| tree | 9a1e9748774d5583b401da69961d38ab872c6ef4 | |
| parent | 94a77cb1d81b6e4e316ae679890df4994816532f (diff) | |
| download | openshift-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
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 2 | ||||
| -rwxr-xr-x | roles/openshift_register_nodes/library/kubernetes_register_node.py | 2 | ||||
| -rw-r--r-- | roles/openshift_register_nodes/tasks/main.yml | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index a650796c7..9e642f3d3 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -64,7 +64,7 @@ post_tasks: - name: Create a tarball of the node config directories command: > - tar -czvf {{ item.config_dir }}.tgz ./ + tar -czvf {{ item.config_dir }}.tgz --transform 's|system:{{ item.node_subdir }}|node|' -C {{ item.config_dir }} . args: 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 - |