diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index cb99152074..bc362860dc 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -938,6 +938,16 @@ openstack-poppy:
     branches:
       - master
 
+swiftonfile:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/swiftonfile
+    branches:
+      - master
+
 dox:
     events:
       - patchset-created
diff --git a/modules/openstack_project/files/accessbot/channels.yaml b/modules/openstack_project/files/accessbot/channels.yaml
index 8463475a5e..e571aebef5 100644
--- a/modules/openstack_project/files/accessbot/channels.yaml
+++ b/modules/openstack_project/files/accessbot/channels.yaml
@@ -138,3 +138,4 @@ channels:
   - name: openstack-lbaas
     mask: full_mask
   - name: congress
+  - name: swiftonfile
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/swiftonfile.config b/modules/openstack_project/files/gerrit/acls/stackforge/swiftonfile.config
new file mode 100644
index 0000000000..657167197d
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/swiftonfile.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+    abandon = group swiftonfile-core
+    label-Code-Review = -2..+2 group swiftonfile-core
+    label-Workflow = -1..+1 group swiftonfile-core
+
+[access "refs/tags/*"]
+    pushSignedTag = group swiftonfile-release
+
+[receive]
+    requireChangeId = true
+    requireContributorAgreement = false
+
+[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 6113ff1596..5673fd7262 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2727,6 +2727,14 @@
       - gate-{name}-tox-{envlist}:
           envlist: keystone
 
+- project:
+    name: swiftonfile
+    node: bare-trusty
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+
 - project:
     name: swiftsync
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 90420535a2..dcb516ed92 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -1245,6 +1245,9 @@
 - project: stackforge/swift3
   description: Swift3 Middleware for OpenStack Swift, allowing access to OpenStack swift via the Amazon S3 API.
   upstream: git://github.com/fujita/swift3.git
+- project: stackforge/swiftonfile
+  description: Swift Object Server implementation that enables objects created using the Swift API to be accessed as files on a POSIX filesystem.
+  upstream: git://github.com/swiftonfile/swiftonfile.git
 - project: stackforge/swiftpolicy
   description: SwiftPolicy Middleware for OpenStack Swift allows to use a JSON policy file to handle swift authorizations.
   upstream: git://github.com/cloudwatt/swiftpolicy.git
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 28ff1b2957..13118c9c35 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4992,6 +4992,16 @@ projects:
       - gate-swift3-tox-tempauth
       - gate-swift3-tox-keystone
 
+  - name: stackforge/swiftonfile
+    template:
+      - name: merge-check
+    check:
+      - gate-swiftonfile-pep8
+      - gate-swiftonfile-python27
+    gate:
+      - gate-swiftonfile-pep8
+      - gate-swiftonfile-python27
+
   - name: stackforge/swiftpolicy
     template:
       - name: merge-check