diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 2328b0fd11..324f4d6b22 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -216,6 +216,13 @@
   acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
+- project: openstack-infra/puppet-elasticsearch
+  use-storyboard: true
+  upstream: git://github.com/mmedvede/puppet-elasticsearch.git
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
+  description: Puppet module for elasticsearch
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-github
   use-storyboard: true
   upstream: git://github.com/nibalizer/openstackci-github
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 796d2b3901..6cc7a9efe6 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -34,6 +34,7 @@ openstack-infra:
       - openstack-infra/publications
       - openstack-infra/puppet-apparmor
       - openstack-infra/puppet-dashboard
+      - openstack-infra/puppet-elasticsearch
       - openstack-infra/puppet-github
       - openstack-infra/puppet-httpd
       - openstack-infra/puppet-jenkins
@@ -819,6 +820,7 @@ openstack-merges:
       - openstack-infra/publications
       - openstack-infra/puppet-apparmor
       - openstack-infra/puppet-dashboard
+      - openstack-infra/puppet-elasticsearch
       - openstack-infra/puppet-github
       - openstack-infra/puppet-httpd
       - openstack-infra/puppet-jenkins
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index c212e7a494..3712105642 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2037,6 +2037,14 @@
       - gate-{name}-pep8
       - gate-{name}-bashate
 
+- project:
+    name: puppet-elasticsearch
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-check-jobs
+
 - project:
     name: puppet-github
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 51d3dcf783..78d6121010 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3344,6 +3344,12 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
+  - name: openstack-infra/puppet-elasticsearch
+    template:
+      - name: merge-check
+      - name: puppet-check-jobs
+      - name: infra-puppet-apply-jobs
+
   - name: openstack-infra/puppet-github
     template:
       - name: merge-check