diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml
index a7122a052d..8b8cc099dd 100644
--- a/accessbot/channels.yaml
+++ b/accessbot/channels.yaml
@@ -146,6 +146,7 @@ channels:
   - name: packstack-dev
   - name: pecanpy
   - name: refstack
+  - name: senlin
   - name: solum
   - name: storyboard
   - name: striker-dev
diff --git a/gerrit/acls/stackforge/senlin.config b/gerrit/acls/stackforge/senlin.config
new file mode 100644
index 0000000000..d83f88beda
--- /dev/null
+++ b/gerrit/acls/stackforge/senlin.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group senlin-core
+label-Code-Review = -2..+2 group senlin-core
+label-Workflow = -1..+1 group senlin-core
+
+[access "refs/tags/*"]
+pushSignedTag = group senlin-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 3b4d6fd8be..f11e7a092b 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -2053,6 +2053,9 @@
   description: Saml generation tool that generates saml responses for federation testing
 - project: stackforge/satori
   description: Configuration Discovery
+- project: stackforge/senlin
+  description: Clustering service for managing homogeneous objects in OpenStack
+  upstream: git://github.com/tengqm/senlin.git
 - project: stackforge/shaker
   description: Distributed data-plane performance testing tool
 - project: stackforge/solum
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 60cb2bd09d..1ec227b309 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1080,6 +1080,16 @@ refstack:
     branches:
       - master
 
+senlin:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/senlin
+    branches:
+      - master
+
 solum:
     events:
       - patchset-created
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index d40b763393..62d2b78b4c 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4755,6 +4755,14 @@
       - python-jobs
       - hook-{name}-rtfd
 
+- project:
+    name: senlin
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: shaker
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 63ae091508..a1820a17b0 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6313,6 +6313,14 @@ projects:
     post:
       - satori-coverage
 
+  - name: stackforge/senlin
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: python3-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
+
   - name: stackforge/shaker
     template:
       - name: merge-check