Merge "Add Ceph FS Charm"

This commit is contained in:
Jenkins 2016-11-10 07:44:06 +00:00 committed by Gerrit Code Review
commit 4b58513ce3
4 changed files with 21 additions and 0 deletions

View File

@ -997,6 +997,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

View File

@ -390,6 +390,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

View File

@ -764,6 +764,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

View File

@ -5889,6 +5889,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