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-resource-registry-puppet.yaml

@@ -18,7 +18,6 @@ resource_registry:
   OS::TripleO::BlockStoragePostDeployment: puppet/cinder-storage-post.yaml
   OS::TripleO::CephStoragePostDeployment: puppet/ceph-storage-post.yaml
   OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml
-  OS::TripleO::CephClusterConfig::SoftwareConfig: puppet/ceph-cluster-config.yaml
   OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
 
   # Tasks (for internal TripleO usage)

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]}

puppet/ceph-cluster-config.yaml

@@ -1,34 +0,0 @@
-heat_template_version: 2015-04-30
-description: 'Ceph Cluster config data for Puppet'
-
-parameters:
-  NovaRbdPoolName:
-    default: vms
-    type: string
-  CephClientUserName:
-    default: openstack
-    type: string
-
-resources:
-  CephClusterConfigImpl:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: os-apply-config
-      config:
-        hiera:
-          datafiles:
-            ceph_cluster:
-              mapped_data:
-                nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName}
-                nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName}
-                nova::compute::rbd::rbd_keyring:
-                  list_join:
-                  - '.'
-                  - - 'client'
-                    - {get_param: CephClientUserName}
-
-outputs:
-  config_id:
-    description: The ID of the CephClusterConfigImpl resource.
-    value:
-      {get_resource: CephClusterConfigImpl}

puppet/services/nova-compute.yaml

@@ -9,6 +9,12 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  NovaRbdPoolName:
+    default: vms
+    type: string
+  CephClientUserName:
+    default: openstack
+    type: string
 
 resources:
   NovaBase:
@@ -29,6 +35,13 @@ outputs:
             nova::compute::libvirt::migration_support: false
             tripleo::profile::base::nova::manage_migration: true
             tripleo::profile::base::nova::nova_compute_enabled: true
+            nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName}
+            nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName}
+            nova::compute::rbd::rbd_keyring:
+              list_join:
+              - '.'
+              - - 'client'
+                - {get_param: CephClientUserName}
       step_config: |
         # TODO(emilien): figure how to deal with libvirt profile.
         # We'll probably threat it like we do with Neutron plugins.