diff --git a/roles/wip-upload-logs-swift/README.rst b/roles/wip-upload-logs-swift/README.rst
index 7b216dee8..beb12efbe 100644
--- a/roles/wip-upload-logs-swift/README.rst
+++ b/roles/wip-upload-logs-swift/README.rst
@@ -46,3 +46,8 @@ This uploads logs to an OpenStack Object Store (Swift) container.
 
    If the container is created, should it be created with global read
    ACLs.  If the container already exists, it will not be modified.
+
+.. zuul:rolevar:: zuul_log_path
+   :default: Generated by the role `set-zuul-log-path-fact`
+
+   Prepend this path to the object names when uploading.
diff --git a/roles/wip-upload-logs-swift/tasks/main.yaml b/roles/wip-upload-logs-swift/tasks/main.yaml
index 0c1b229f2..04d454112 100644
--- a/roles/wip-upload-logs-swift/tasks/main.yaml
+++ b/roles/wip-upload-logs-swift/tasks/main.yaml
@@ -1,6 +1,7 @@
 - name: Set zuul-log-path fact
   include_role:
     name: set-zuul-log-path-fact
+  when: zuul_log_path is not defined
 
 # Always upload (true), never upload (false) or only on failure ('failure')
 - when: zuul_site_upload_logs | default(true) | bool or