From b8d99a6e770715e25b62d17592b386791a547c61 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 13 Oct 2015 11:28:58 -0400
Subject: [PATCH] Import puppet-grafyaml

A simple module to configure and run grafyaml, a tool for creating
grafana dashboards from yaml files.

Change-Id: I07577d72b2d5d6a552a9f50f551263fe3ac47dfb
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 gerrit/acls/openstack-infra/puppet-grafyaml.config | 13 +++++++++++++
 gerrit/projects.yaml                               |  6 ++++++
 gerritbot/channels.yaml                            |  2 ++
 jenkins/jobs/projects.yaml                         | 11 +++++++++++
 zuul/layout.yaml                                   |  7 +++++++
 5 files changed, 39 insertions(+)
 create mode 100644 gerrit/acls/openstack-infra/puppet-grafyaml.config

diff --git a/gerrit/acls/openstack-infra/puppet-grafyaml.config b/gerrit/acls/openstack-infra/puppet-grafyaml.config
new file mode 100644
index 0000000000..2422095476
--- /dev/null
+++ b/gerrit/acls/openstack-infra/puppet-grafyaml.config
@@ -0,0 +1,13 @@
+[access "refs/heads/*"]
+abandon = group puppet-grafyaml-core
+label-Code-Review = -2..+2 group puppet-grafyaml-core
+label-Workflow = -1..+1 group puppet-grafyaml-core
+
+[access "refs/tags/*"]
+pushSignedTag = group puppet-grafyaml-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index b0f01e79c9..b87b0a0738 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -362,6 +362,12 @@
   description: Puppet module to add github functionality
   groups:
     - openstack-ci
+- project: openstack-infra/puppet-grafyaml
+  use-storyboard: true
+  description: Puppet module for Graphite
+  groups:
+    - openstack-ci
+  upstream: https://github.com/pabelanger/puppet-grafyaml
 - project: openstack-infra/puppet-graphite
   use-storyboard: true
   description: Puppet module for Graphite
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 6414640a8a..d9219b4d55 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -647,6 +647,7 @@ openstack-infra:
     - openstack-infra/puppet-gerrit
     - openstack-infra/puppet-gerritbot
     - openstack-infra/puppet-github
+    - openstack-infra/puppet-grafyaml
     - openstack-infra/puppet-graphite
     - openstack-infra/puppet-haveged
     - openstack-infra/puppet-hound
@@ -909,6 +910,7 @@ openstack-merges:
     - openstack-infra/puppet-gerrit
     - openstack-infra/puppet-gerritbot
     - openstack-infra/puppet-github
+    - openstack-infra/puppet-grafyaml
     - openstack-infra/puppet-graphite
     - openstack-infra/puppet-haveged
     - openstack-infra/puppet-hound
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5e4780ec5b..019ed51b62 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4244,6 +4244,17 @@
           branch-designator: ''
           branch-override: default
 
+- project:
+    name: puppet-grafyaml
+    node: 'bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-check-jobs
+      - puppet-beaker-jobs:
+          branch-designator: '-nv'
+          branch-override: default
+
 - project:
     name: puppet-graphite
     node: 'bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 47df63bc06..ee1324b3a0 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2654,6 +2654,13 @@ projects:
       - name: infra-puppet-apply-jobs
       - name: puppet-beaker-jobs-nv
 
+  - name: openstack-infra/puppet-grafyaml
+    template:
+      - name: merge-check
+      - name: infra-puppet-check-jobs
+      - name: infra-puppet-apply-jobs
+      - name: puppet-beaker-jobs-nv
+
   - name: openstack-infra/puppet-graphite
     template:
       - name: merge-check