From 5dfa310e6b8ca1f918694930128143712a21a66a Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Tue, 18 Oct 2016 10:27:26 +0000
Subject: [PATCH] Add charm-manila-generic and interface

This patchset adds the charm-manila-generic which is to configure the
manila charm to use the generic interface.  The
charm-interface-manila-plugin which connects backend configuration
charms to manila.

Change-Id: I5e0fbcf4f192905c275f93422841ecce07b114a5
Needed-By: I810d9737fe67a04f63edd9a5d333b34f937f2405
---
 gerrit/projects.yaml       | 12 +++++++++++-
 jenkins/jobs/projects.yaml | 16 ++++++++++++++++
 zuul/layout.yaml           | 11 +++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 7fb5bfb470..81c671db02 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1089,8 +1089,11 @@
 - project: openstack/charm-interface-keystone-credentials
   description: Charm Interface - Keystone Credentials
   acl-config: /home/gerrit2/acls/openstack/charm.config
+- project: openstack/charm-interface-manila-plugin
+  description: Charm Interface - Manila configuration plugin
+  acl-config: /home/gerrit2/acls/openstack/charm.config
 - project: openstack/charm-interface-mysql-shared
-  description: Charm Interface - MySQL Sahred
+  description: Charm Interface - MySQL Shared
   acl-config: /home/gerrit2/acls/openstack/charm.config
 - project: openstack/charm-interface-neutron-plugin
   description: Charm Interface - Neutron Plugin
@@ -1143,6 +1146,13 @@
     - manila (Juju Charms Collection)
   options:
     - delay-release
+- project: openstack/charm-manila-generic
+  description: Juju Charm - Manila fileshare generic backend plugin
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  groups:
+    - manila-generic-plugin (Juju Charms Collection)
+  options:
+    - delay-release
 - project: openstack/charm-neutron-api
   description: Juju Charm - Neutron API
   acl-config: /home/gerrit2/acls/openstack/charm.config
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index b5cbeb847e..adeedeb450 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -872,6 +872,13 @@
     jobs:
       - python-charm-interface-jobs
 
+- project:
+    name: charm-interface-manila-plugin
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-charm-interface-jobs
+
 - project:
     name: charm-interface-mysql-shared
     tarball-site: tarballs.openstack.org
@@ -972,6 +979,15 @@
       - 'gate-{name}-python35{suffix}':
           suffix: ''
 
+- project:
+    name: charm-manila-generic
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-charm-jobs
+      - 'gate-{name}-python35{suffix}':
+          suffix: ''
+
 - project:
     name: charm-neutron-api
     tarball-site: tarballs.openstack.org
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 37438af07a..d22a8fa6d2 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5920,6 +5920,11 @@ projects:
       - name: merge-check
       - name: python-charm-interface-jobs
 
+  - name: openstack/charm-interface-manila-plugin
+    template:
+      - name: merge-check
+      - name: python-charm-interface-jobs
+
   - name: openstack/charm-interface-mysql-shared
     template:
       - name: merge-check
@@ -5991,6 +5996,12 @@ projects:
       - name: python-charm-jobs
       - name: python35-jobs
 
+  - name: openstack/charm-manila-generic
+    template:
+      - name: merge-check
+      - name: python-charm-jobs
+      - name: python35-jobs
+
   - name: openstack/charm-neutron-api
     template:
       - name: merge-check