From 1de64f2e0acc70fd1b506a4634726f3605d39553 Mon Sep 17 00:00:00 2001
From: Bob Callaway <bob.callaway@netapp.com>
Date: Wed, 24 Sep 2014 13:56:54 -0400
Subject: [PATCH] Add puppet-manila to Stackforge

This is the initial request to add puppet-manila to stackforge.

Change-Id: I4244ebc56839d58d89037fe18ec70dbea6b90846
---
 modules/gerritbot/files/gerritbot_channel_config.yaml    | 2 ++
 .../files/jenkins_job_builder/config/projects.yaml       | 9 +++++++++
 modules/openstack_project/files/review.projects.yaml     | 4 ++++
 modules/openstack_project/files/zuul/layout.yaml         | 6 ++++++
 4 files changed, 21 insertions(+)

diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 43425dd34a..39bc9c1474 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -279,6 +279,7 @@ puppet-openstack:
       - stackforge/puppet-horizon
       - stackforge/puppet-ironic
       - stackforge/puppet-keystone
+      - stackforge/puppet-manila
       - stackforge/puppet-neutron
       - stackforge/puppet-nova
       - stackforge/puppet-openstack
@@ -672,6 +673,7 @@ openstack-manila:
     projects:
       - openstack/manila
       - openstack/python-manilaclient
+      - stackforge/puppet-manila
     branches:
       - master
 
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 bf60960d53..54da3031d1 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2079,6 +2079,15 @@
       - puppet-check-jobs
       - puppet-module-unit
 
+- project:
+    name: puppet-manila
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-check-jobs
+      - puppet-module-unit
+
 - project:
     name: openstack-chef-repo
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index bc90bec3dd..a7139c27f6 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -1072,6 +1072,10 @@
   description: OpenStack Keystone Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-keystone.git
+- project: stackforge/puppet-manila
+  description: StackForge Manila Puppet Module
+  acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
+  upstream: git://github.com/NetApp-openstack-dev/puppet-manila.git
 - project: stackforge/puppet-n1k-vsm
   description: Foreman Puppet installer for Cisco N1KV Virtual Supervisor Module
   upstream: git://github.com/CiscoSystems/puppet-n1k-vsm
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 1f2789ec54..2d7ae18329 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4535,6 +4535,12 @@ projects:
       - name: puppet-check-jobs
       - name: puppet-module-unit-jobs
 
+  - name: stackforge/puppet-manila
+    template:
+      - name: merge-check
+      - name: puppet-check-jobs
+      - name: puppet-module-unit-jobs
+
   - name: stackforge/puppet-n1k-vsm
     template:
       - name: merge-check