openstack/tripleo-heat-templates
Code Issues Proposed changes

Migrates ceph-{radosgw,mds,rbdmirror} to ceph-ansible

Browse Source 
Previously these environment files were pointing to a version of
the services implemented using puppet-ceph, now they are migrated
to using ceph-ansible.

Change-Id: I159e2e9408dc5749ec0c287ef06aa0b1421b7d88
Closes-Bug: 1744714
This commit is contained in:
Giulio Fidente 2018-01-22 14:07:03 +01:00
parent bd376f79db
commit e2caa40579
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
environments/ceph-radosgw.yaml
View File

@ -1,5 +1,8 @@
# ******************************************************************************
# DEPRECATED: Use ./ceph-ansible/ceph-rgw.yaml
# ******************************************************************************
resource_registry: resource_registry:
OS::TripleO::Services::CephRgw: ../puppet/services/ceph-rgw.yaml OS::TripleO::Services::CephRgw: ../docker/services/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None

5
environments/services/ceph-mds.yaml
View File

@ -1,2 +1,5 @@
# ******************************************************************************
# DEPRECATED: Use ../ceph-ansible/ceph-mds.yaml
# ******************************************************************************
resource_registry: resource_registry:
OS::TripleO::Services::CephMds: ../../puppet/services/ceph-mds.yaml OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml

5
environments/services/ceph-rbdmirror.yaml
View File

@ -1,2 +1,5 @@
# ******************************************************************************
# DEPRECATED: Use ../ceph-ansible/ceph-rbdmirror.yaml
# ******************************************************************************
resource_registry: resource_registry:
OS::TripleO::Services::CephRbdMirror: ../../puppet/services/pacemaker/ceph-rbdmirror.yaml OS::TripleO::Services::CephRbdMirror: ../../docker/services/ceph-ansible/ceph-rbdmirror.yaml

3
environments/storage-environment-external.yaml
View File

@ -1,3 +1,6 @@
# ******************************************************************************
# DEPRECATED: Use ./ceph-ansible/ceph-ansible-external.yaml
# ******************************************************************************
# A Heat environment file which can be used to enable the # A Heat environment file which can be used to enable the
# use of an externally managed Ceph cluster. # use of an externally managed Ceph cluster.
resource_registry: resource_registry:

4
environments/storage-environment.yaml
View File

@ -1,3 +1,7 @@
# ******************************************************************************
# This file will not enable the deployment of Ceph in future releases.
# Use ./ceph-ansible/ceph-ansible.yaml for this purpose instead.
# ******************************************************************************
## A Heat environment file which can be used to set up storage ## A Heat environment file which can be used to set up storage
## backends. Defaults to Ceph used as a backend for Cinder, Glance and ## backends. Defaults to Ceph used as a backend for Cinder, Glance and
## Nova ephemeral storage. ## Nova ephemeral storage.