Merge "Add charm-glusterfs and charm-manila-glusterfs"

gerrit/projects.yaml

@@ -1116,6 +1116,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
@@ -1217,6 +1222,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

gerritbot/channels.yaml

@@ -442,6 +442,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
@@ -450,6 +451,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

jenkins/jobs/projects.yaml

@@ -874,6 +874,12 @@
     jobs:
       - python-charm-jobs
 
+- project:
+    name: charm-glusterfs
+
+    jobs:
+      - python-charm-jobs
+
 - project:
     name: charm-guide
 
@@ -1050,6 +1056,12 @@
     jobs:
       - python-charm-jobs
 
+- project:
+    name: charm-manila-glusterfs
+
+    jobs:
+      - python-charm-jobs
+
 - project:
     name: charm-mistral
 

zuul/layout.yaml

@@ -6417,6 +6417,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
@@ -6573,6 +6579,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