diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml
index 6a3f9b7d18..8539ae5512 100644
--- a/deployment/swift/swift-storage-container-puppet.yaml
+++ b/deployment/swift/swift-storage-container-puppet.yaml
@@ -621,14 +621,14 @@ outputs:
             dev: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
             opts: -f -i size=1024
           with_items: "{{ swift_raw_disks }}"
-          when: swift_raw_disks
+          when: swift_raw_disks|length > 0
         - name: Refresh facts if SwiftRawDisks is set to get uuids if newly created partitions
           setup:
             gather_subset:
               - '!all'
               - '!min'
               - 'hardware'
-          when: swift_raw_disks
+          when: swift_raw_disks|length > 0
         - name: Mount devices defined in SwiftRawDisks
           mount:
             name: /srv/node/{{ item }}
@@ -637,7 +637,7 @@ outputs:
             opts: noatime
             state: mounted
           with_items: "{{ swift_raw_disks }}"
-          when: swift_raw_disks
+          when: swift_raw_disks|length > 0
       deploy_steps_tasks:
         - name: Configure rsyslog for swift-storage
           when: