Add default to False to avoid error when variable is not defined

openshift · Jan 16, 2018 · 09fa03d · 09fa03d
1 parent 474a850
commit 09fa03d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/playbooks/openshift-hosted/private/create_persistent_volumes.yml b/playbooks/openshift-hosted/private/create_persistent_volumes.yml
@@ -11,7 +11,7 @@
     persistentlocalstorage_classes: "{{ openshift_persistentlocalstorage_classes | default([]) }}"
   roles:
   - role: openshift_persistentlocalstorage
-    when: openshift_persistentlocalstorage_enabled | bool
+    when: openshift_persistentlocalstorage_enabled | default(False) | bool
 
 - name: Create Hosted Resources - Persistent Local Storage Classes
   hosts: nodes

diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
@@ -75,7 +75,7 @@ r_openshift_master_data_dir: "{{ r_openshift_master_data_dir_default }}"
 r_openshift_master_sdn_network_plugin_name_default: "{{ os_sdn_network_plugin_name | default('redhat/openshift-ovs-subnet') }}"
 r_openshift_master_sdn_network_plugin_name: "{{ r_openshift_master_sdn_network_plugin_name_default }}"
 
-openshift_master_use_persistentlocalvolumes: "{{ openshift_persistentlocalstorage_enabled | default(False) }}"
+openshift_master_use_persistentlocalvolumes: "{{ openshift_persistentlocalstorage_enabled | default(False) | bool }}"
 
 openshift_master_image_config_latest_default: "{{ openshift_image_config_latest | default(False) }}"
 openshift_master_image_config_latest: "{{ openshift_master_image_config_latest_default }}"

diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
@@ -143,4 +143,4 @@ openshift_node_image_config_latest: "{{ openshift_node_image_config_latest_defau
 
 openshift_node_use_instance_profiles: False
 
-openshift_node_use_persistentlocalvolumes: "{{ openshift_persistentlocalstorage_enabled | default(False) }}"
+openshift_node_use_persistentlocalvolumes: "{{ openshift_persistentlocalstorage_enabled | default(False) | bool }}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -143,4 +143,4 @@ openshift_node_image_config_latest: "{{ openshift_node_image_config_latest_defau

		openshift_node_use_instance_profiles: False

		openshift_node_use_persistentlocalvolumes: "{{ openshift_persistentlocalstorage_enabled \| default(False) }}"
		openshift_node_use_persistentlocalvolumes: "{{ openshift_persistentlocalstorage_enabled \| default(False) \| bool }}"