From e2caa4057937a940a392a044a6cdd83e121dc63e Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 22 Jan 2018 14:07:03 +0100 Subject: [PATCH] Migrates ceph-{radosgw,mds,rbdmirror} to ceph-ansible 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 --- environments/ceph-radosgw.yaml | 5 ++++- environments/services/ceph-mds.yaml | 5 ++++- environments/services/ceph-rbdmirror.yaml | 5 ++++- environments/storage-environment-external.yaml | 3 +++ environments/storage-environment.yaml | 4 ++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/environments/ceph-radosgw.yaml b/environments/ceph-radosgw.yaml index a9221a2a27..333c86b62d 100644 --- a/environments/ceph-radosgw.yaml +++ b/environments/ceph-radosgw.yaml @@ -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 diff --git a/environments/services/ceph-mds.yaml b/environments/services/ceph-mds.yaml index 2b51374c8e..120a13a40a 100644 --- a/environments/services/ceph-mds.yaml +++ b/environments/services/ceph-mds.yaml @@ -1,2 +1,5 @@ +# ****************************************************************************** +# DEPRECATED: Use ../ceph-ansible/ceph-mds.yaml +# ****************************************************************************** resource_registry: - OS::TripleO::Services::CephMds: ../../puppet/services/ceph-mds.yaml \ No newline at end of file + OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml diff --git a/environments/services/ceph-rbdmirror.yaml b/environments/services/ceph-rbdmirror.yaml index b350e4c5dd..ff1748a9d3 100644 --- a/environments/services/ceph-rbdmirror.yaml +++ b/environments/services/ceph-rbdmirror.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 diff --git a/environments/storage-environment-external.yaml b/environments/storage-environment-external.yaml index 46f9b095e8..1534d1d9c2 100644 --- a/environments/storage-environment-external.yaml +++ b/environments/storage-environment-external.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: diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml index 62c402a081..8042062c8b 100644 --- a/environments/storage-environment.yaml +++ b/environments/storage-environment.yaml @@ -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.