Merge "Migrates ceph-{radosgw,mds,rbdmirror} to ceph-ansible"
This commit is contained in:
commit
12a88d6b38
|
@ -1,5 +1,8 @@
|
|||
# ******************************************************************************
|
||||
# DEPRECATED: Use ./ceph-ansible/ceph-rgw.yaml
|
||||
# ******************************************************************************
|
||||
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::SwiftStorage: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||
|
|
|
@ -1,2 +1,5 @@
|
|||
# ******************************************************************************
|
||||
# DEPRECATED: Use ../ceph-ansible/ceph-mds.yaml
|
||||
# ******************************************************************************
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CephMds: ../../puppet/services/ceph-mds.yaml
|
||||
OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
|
||||
|
|
|
@ -1,2 +1,5 @@
|
|||
# ******************************************************************************
|
||||
# DEPRECATED: Use ../ceph-ansible/ceph-rbdmirror.yaml
|
||||
# ******************************************************************************
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CephRbdMirror: ../../puppet/services/pacemaker/ceph-rbdmirror.yaml
|
||||
OS::TripleO::Services::CephRbdMirror: ../../docker/services/ceph-ansible/ceph-rbdmirror.yaml
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
# ******************************************************************************
|
||||
# DEPRECATED: Use ./ceph-ansible/ceph-ansible-external.yaml
|
||||
# ******************************************************************************
|
||||
# A Heat environment file which can be used to enable the
|
||||
# use of an externally managed Ceph cluster.
|
||||
resource_registry:
|
||||
|
|
|
@ -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
|
||||
## backends. Defaults to Ceph used as a backend for Cinder, Glance and
|
||||
## Nova ephemeral storage.
|
||||
|
|
Loading…
Reference in New Issue