diff --git a/roles/change-devstack-data-owner/README.rst b/roles/change-devstack-data-owner/README.rst
new file mode 100644
index 0000000..33ddddc
--- /dev/null
+++ b/roles/change-devstack-data-owner/README.rst
@@ -0,0 +1,23 @@
+Change the ownership of a specific devstack data subdirectory
+
+This is needed in order to have cinderlib functional tests,
+which are normally executed by the `zuul` user, run under
+a devstack deployment where the `stack` user is the owner.
+
+**Role Variables**
+
+.. zuul:rolevar:: devstack_data_dir
+   :default: /opt/stack/data
+
+   The devstack data directory.
+
+.. zuul:rolevar:: devstack_data_subdir_changed
+   :default: cinder
+
+   The devstack data subdirectory whose ownership
+   is changed.
+
+.. zuul:rolevar:: devstack_data_subdir_owner
+   :default: zuul
+
+   The new owner of the specified devstack data subdirectory.
diff --git a/roles/change-devstack-data-owner/defaults/main.yaml b/roles/change-devstack-data-owner/defaults/main.yaml
new file mode 100644
index 0000000..ea86874
--- /dev/null
+++ b/roles/change-devstack-data-owner/defaults/main.yaml
@@ -0,0 +1,3 @@
+devstack_data_dir: /opt/stack/data
+devstack_data_subdir_changed: cinder
+devstack_data_subdir_owner: zuul
diff --git a/roles/change-devstack-data-owner/tasks/main.yaml b/roles/change-devstack-data-owner/tasks/main.yaml
new file mode 100644
index 0000000..bd1977a
--- /dev/null
+++ b/roles/change-devstack-data-owner/tasks/main.yaml
@@ -0,0 +1,6 @@
+- name: Change the owner of specific devstack data files
+  file:
+    path: "{{ devstack_data_dir }}/{{ devstack_data_subdir_changed }}"
+    owner: "{{ devstack_data_subdir_owner }}"
+    recurse: yes
+  become: yes