From e6cc1a154a3b26f7a07605458c3f5cf34f069685 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Thu, 25 May 2017 10:37:51 -0700
Subject: [PATCH] Add charm-glusterfs and charm-manila-glusterfs

Add charms for GlusterFS and Manila GlusterFS backend. These charms
deploy a GlusterFS cluster and can be used as a manila backend.

These repos are intentionally being initialized empty without an
initial import. The first commit will be the initial import.

Change-Id: Ib5b5af80c9603295319664acbc31651a818beb78
Needed-By: Id61f0475d003f4c3f93f59d7a7887a1a8a0f18eb
---
 gerrit/projects.yaml       | 10 ++++++++++
 gerritbot/channels.yaml    |  2 ++
 jenkins/jobs/projects.yaml | 12 ++++++++++++
 zuul/layout.yaml           | 12 ++++++++++++
 4 files changed, 36 insertions(+)

diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 88309ff954..d02a0e9153 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1108,6 +1108,11 @@
   acl-config: /home/gerrit2/acls/openstack/charm.config
   options:
     - delay-release
+- project: openstack/charm-glusterfs
+  description: Juju Charm - GlusterFS
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  options:
+    - delay-release
 - project: openstack/charm-guide
   description: OpenStack Charms development and usage documentation
   acl-config: /home/gerrit2/acls/openstack/charm.config
@@ -1209,6 +1214,11 @@
   acl-config: /home/gerrit2/acls/openstack/charm.config
   options:
     - delay-release
+- project: openstack/charm-manila-glusterfs
+  description: Juju Charm - Manila-GlusterFS Backend
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  options:
+    - delay-release
 - project: openstack/charm-mistral
   description: Juju Charm - Mistral workflow service
   acl-config: /home/gerrit2/acls/openstack/charm.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 6e9ce8230e..1a804fc3f5 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -441,6 +441,7 @@ openstack-charms:
     - openstack/charm-designate
     - openstack/charm-designate-bind
     - openstack/charm-glance
+    - openstack/charm-glusterfs
     - openstack/charm-guide
     - openstack/charm-hacluster
     - openstack/charm-heat
@@ -449,6 +450,7 @@ openstack-charms:
     - openstack/charm-keystone-ldap
     - openstack/charm-lxd
     - openstack/charm-manila
+    - openstack/charm-manila-glusterfs
     - openstack/charm-mistral
     - openstack/charm-murano
     - openstack/charm-neutron-api
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index be8f4d456b..d9a3bc36a5 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -851,6 +851,12 @@
     jobs:
       - python-charm-jobs
 
+- project:
+    name: charm-glusterfs
+
+    jobs:
+      - python-charm-jobs
+
 - project:
     name: charm-guide
 
@@ -1027,6 +1033,12 @@
     jobs:
       - python-charm-jobs
 
+- project:
+    name: charm-manila-glusterfs
+
+    jobs:
+      - python-charm-jobs
+
 - project:
     name: charm-mistral
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2749426935..bba43c6489 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6424,6 +6424,12 @@ projects:
       - name: python-charm-jobs
       - name: python35-jobs-nv
 
+  - name: openstack/charm-glusterfs
+    template:
+      - name: merge-check
+      - name: python-charm-jobs
+      - name: python35-jobs
+
   - name: openstack/charm-guide
     template:
       - name: merge-check
@@ -6580,6 +6586,12 @@ projects:
       - name: python-charm-jobs
       - name: python35-jobs
 
+  - name: openstack/charm-manila-glusterfs
+    template:
+      - name: merge-check
+      - name: python-charm-jobs
+      - name: python35-jobs
+
   - name: openstack/charm-mistral
     template:
       - name: merge-check