Home Explore Help
Register Sign In
shixiong
/
okd
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix : (node) labels defaults correctly to the variable openshift_node_labels when oo_option returns an empty list

Chengcheng Mu 9 years ago
parent
6b511f103d
commit
46f10c8793
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      roles/openshift_node/tasks/main.yml

+ 1 - 1
roles/openshift_node/tasks/main.yml
View File 

@@ -22,7 +22,7 @@
 
       deployment_type: "{{ openshift_deployment_type }}"
 
   - role: node
 
     local_facts:
 
-      labels: "{{ lookup('oo_option', 'openshift_node_labels') | default( openshift_node_labels | default() ) }}"
 
+      labels: "{{ lookup('oo_option', 'openshift_node_labels') | default( openshift_node_labels | default(none), true) }}"
 
       annotations: "{{ openshift_node_annotations | default(none) }}"
 
       registry_url: "{{ oreg_url | default(none) }}"
 
       debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}"