From 6353a031d3600746e55d14253cc83484c9863258 Mon Sep 17 00:00:00 2001
From: Chris Holcombe <xfactor973@gmail.com>
Date: Mon, 24 Oct 2016 14:56:26 -0700
Subject: [PATCH] Add Ceph FS Charm

Adding a Ceph FS charm to the charm collection.
This will enable users to easily deploy Ceph's MDS
server to their cluster.

Change-Id: I60bbbca2179b6a3ec2ac369741baa44b5bf482ba
Needed-By: If0c6e917960f8bdb244f07dbe446dc601d7fea6a
---
 gerrit/projects.yaml       | 8 ++++++++
 gerritbot/channels.yaml    | 1 +
 jenkins/jobs/projects.yaml | 7 +++++++
 zuul/layout.yaml           | 5 +++++
 4 files changed, 21 insertions(+)

diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 0d420e4d9a..2d3009a43f 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -987,6 +987,14 @@
     - ceph (Juju Charms Collection)
   options:
     - delay-release
+- project: openstack/charm-ceph-fs
+  description: Juju Charm - Ceph FS
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  upstream: https://github.com/cholcombe973/charm-ceph-fs
+  groups:
+    - ceph-fs (Juju Charms Collection)
+  options:
+    - delay-release
 - project: openstack/charm-ceph-mon
   description: Juju Charm - Ceph MON
   acl-config: /home/gerrit2/acls/openstack/charm.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 68fe78ddc3..785bb64354 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -410,6 +410,7 @@ openstack-charms:
     - openstack/charm-ceilometer
     - openstack/charm-ceilometer-agent
     - openstack/charm-ceph
+    - openstack/charm-ceph-fs
     - openstack/charm-ceph-mon
     - openstack/charm-ceph-osd
     - openstack/charm-ceph-proxy
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 75ab643c06..02f0e9e342 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -741,6 +741,13 @@
     jobs:
       - python-charm-jobs
 
+- project:
+    name: charm-ceph-fs
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-charm-jobs
+
 - project:
     name: charm-ceph-mon
     tarball-site: tarballs.openstack.org
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 55f7083319..1871949f1f 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5823,6 +5823,11 @@ projects:
       - name: merge-check
       - name: python-charm-jobs
 
+  - name: openstack/charm-ceph-fs
+    template:
+      - name: merge-check
+      - name: python-charm-jobs
+
   - name: openstack/charm-ceph-mon
     template:
       - name: merge-check