diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 76b5412b06..58fef10869 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -790,6 +790,7 @@ openstack-oslo:
       - openstack/oslo.version
       - openstack/oslo.vmware
       - openstack/pycadf
+      - openstack/pylockfile
       - openstack/stevedore
       - openstack/taskflow
       - openstack-dev/cookiecutter
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/pylockfile.config b/modules/openstack_project/files/gerrit/acls/openstack/pylockfile.config
new file mode 100644
index 0000000000..6e730bbe12
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/pylockfile.config
@@ -0,0 +1,11 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group pylockfile-core
+        label-Workflow = -1..+1 group pylockfile-core
+        abandon = group pylockfile-core
+[access "refs/tags/*"]
+        pushSignedTag = group pylockfile-release
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 803616e4e2..3b4e93ad7c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2338,6 +2338,17 @@
       - openstack-publish-jobs
       - pypi-jobs
 
+- project:
+    name: pylockfile
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - python-jobs
+      - openstack-publish-jobs
+      - pypi-jobs
+
 - project:
     name: pecan
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index da497cf8d0..6628d6bbbf 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -408,6 +408,9 @@
   upstream: git://github.com/dhellmann/oslo.test.git
 - project: openstack/pycadf
   description: CADF Python module
+- project: openstack/pylockfile
+  description: Platform-independent file locking module
+  upstream: git://github.com/smontanaro/pylockfile.git
 - project: openstack/python-barbicanclient
   description: Client library for Barbican API.
   upstream: git://github.com/cloudkeep/python-barbicanclient
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index c6f8d46376..de3e1dcddc 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1317,6 +1317,15 @@ projects:
       - name: integrated-gate
       - name: publish-to-pypi
 
+  - name: openstack/pylockfile
+    template:
+      - name: python-jobs
+      - name: python3-jobs
+      - name: openstack-server-publish-jobs
+      - name: check-requirements
+      - name: integrated-gate
+      - name: publish-to-pypi
+
   - name: openstack/sahara
     template:
       - name: merge-check