From 2720b5d4c875c9794562776114083d9c5fc55896 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 21 Jul 2016 11:16:59 +0200
Subject: Cleanup templates from the shared CephCluster config

Removes from the templates the old CephCluster configuration and
deployment which before roles was distributing the shared settings
for the Ceph cluster configuration.

Change-Id: Ia704f5d7add85e52dd477f4bc758aa0a02e4b39b
---
 overcloud.yaml | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

(limited to 'overcloud.yaml')

diff --git a/overcloud.yaml b/overcloud.yaml
index 503acf5d..9b03e4c4 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -1094,30 +1094,6 @@ resources:
       object_store_swift_devices: {get_attr: [ObjectStorage, swift_device]}
       controller_swift_proxy_memcaches: {get_attr: [Controller, swift_proxy_memcache]}
 
-  ComputeCephDeployment:
-    type: OS::Heat::StructuredDeployments
-    properties:
-      name: ComputeCephDeployment
-      config: {get_attr: [CephClusterConfig, config_id]}
-      servers: {get_attr: [Compute, attributes, nova_server_resource]}
-
-  ControllerCephDeployment:
-    type: OS::Heat::StructuredDeployments
-    properties:
-      name: ControllerCephDeployment
-      config: {get_attr: [CephClusterConfig, config_id]}
-      servers: {get_attr: [Controller, attributes, nova_server_resource]}
-
-  CephStorageCephDeployment:
-    type: OS::Heat::StructuredDeployments
-    properties:
-      name: CephStorageCephDeployment
-      config: {get_attr: [CephClusterConfig, config_id]}
-      servers: {get_attr: [CephStorage, attributes, nova_server_resource]}
-
-  CephClusterConfig:
-    type: OS::TripleO::CephClusterConfig::SoftwareConfig
-
   ControllerAllNodesDeployment:
     type: OS::Heat::StructuredDeployments
     properties:
@@ -1254,14 +1230,14 @@ resources:
   # Nested stack deployment runs after all other controller deployments
   ControllerNodesPostDeployment:
     type: OS::TripleO::ControllerPostDeployment
-    depends_on: [ControllerAllNodesDeployment, ControllerSwiftDeployment, ControllerCephDeployment]
+    depends_on: [ControllerAllNodesDeployment, ControllerSwiftDeployment]
     properties:
       servers: {get_attr: [Controller, attributes, nova_server_resource]}
       RoleData: {get_attr: [ControllerServiceChain, role_data]}
 
   ComputeNodesPostDeployment:
     type: OS::TripleO::ComputePostDeployment
-    depends_on: [ComputeAllNodesDeployment, ComputeCephDeployment]
+    depends_on: [ComputeAllNodesDeployment]
     properties:
       servers: {get_attr: [Compute, attributes, nova_server_resource]}
       RoleData: {get_attr: [ComputeServiceChain, role_data]}
@@ -1282,7 +1258,7 @@ resources:
 
   CephStorageNodesPostDeployment:
     type: OS::TripleO::CephStoragePostDeployment
-    depends_on: [ControllerNodesPostDeployment, CephStorageCephDeployment, CephStorageAllNodesDeployment]
+    depends_on: [ControllerNodesPostDeployment, CephStorageAllNodesDeployment]
     properties:
       servers: {get_attr: [CephStorage, attributes, nova_server_resource]}
       RoleData: {get_attr: [CephStorageServiceChain, role_data]}
-- 
cgit 1.2.3-korg