diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index e4519fd3b1..350f8ff1dd 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -442,3 +442,13 @@ milk-dev:
       - stackforge/milk
     branches:
       - master
+
+openstack-entropy:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/entropy
+    branches:
+      - master
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/entropy.config b/modules/openstack_project/files/gerrit/acls/stackforge/entropy.config
new file mode 100644
index 0000000000..2914b039f4
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/entropy.config
@@ -0,0 +1,12 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group entropy-core
+        label-Approved = +0..+1 group entropy-core
+        workInProgress = group entropy-core
+[access "refs/tags/*"]
+        create = group entropy-core
+        pushTag = group entropy-core
+[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 6c905d0e10..fe7bf11317 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1862,3 +1862,12 @@
 
     jobs:
       - python-jobs
+
+- project:
+    name: entropy
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 8371a95fdd..e220d6b195 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3994,3 +3994,19 @@ projects:
       - gate-noop
     gate:
       - gate-noop
+
+  - name: stackforge/entropy
+    check:
+      - gate-entropy-docs
+      - gate-entropy-pep8
+      - gate-entropy-python26
+      - gate-entropy-python27
+      - gate-entropy-python33
+    gate:
+      - gate-entropy-docs
+      - gate-entropy-pep8
+      - gate-entropy-python26
+      - gate-entropy-python27
+      - gate-entropy-python33
+    post:
+      - entropy-coverage
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index bfeffa28a9..3191c3595e 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -568,3 +568,5 @@
 - project: stackforge/stevedore
   description: Manage dynamic plugins for Python applications
   upstream: git://github.com/dreamhost/stevedore.git
+- project: stackforge/entropy
+  description: A framework for Audit/Repair scripts for openstack