diff options
| author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-09 09:35:40 +0200 |
|---|---|---|
| committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-09 09:35:40 +0200 |
| commit | 46f10c87930747d7e10cfc2c3b71ea68da647135 (patch) | |
| tree | 5234ac32706287f71639a32cc18db98cb8f220b8 /roles | |
| parent | 6b511f103d605e5150488154e0cd5e2e65f64100 (diff) | |
| download | openshift-46f10c87930747d7e10cfc2c3b71ea68da647135.tar.gz openshift-46f10c87930747d7e10cfc2c3b71ea68da647135.tar.bz2 openshift-46f10c87930747d7e10cfc2c3b71ea68da647135.tar.xz openshift-46f10c87930747d7e10cfc2c3b71ea68da647135.zip | |
fix : (node) labels defaults correctly to the variable openshift_node_labels when oo_option returns an empty list
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 96cd96315..d45dd8073 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -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) }}" |