From d90363bd58314c0ae3c166a70d4d1c89391f9386 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 17 Aug 2016 20:18:38 +0200
Subject: Move out of roles any Ceph setting

Change-Id: I6ff0f977a1fb2fd55b29becd296ab01c65b50228
---
 puppet/ceph-storage.yaml | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'puppet/ceph-storage.yaml')

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index de5a9c39..829456b5 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -231,22 +231,6 @@ resources:
       server: {get_resource: CephStorage}
       input_values:
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
-        ceph_cluster_network:
-          get_attr:
-            - NetIpMap
-            - net_ip_map
-            - str_replace:
-                template: "NETWORK_subnet"
-                params:
-                  NETWORK: {get_param: [ServiceNetMap, CephClusterNetwork]}
-        ceph_public_network:
-          get_attr:
-            - NetIpMap
-            - net_ip_map
-            - str_replace:
-                template: "NETWORK_subnet"
-                params:
-                  NETWORK: {get_param: [ServiceNetMap, CephPublicNetwork]}
 
   CephStorageConfig:
     type: OS::Heat::StructuredConfig
@@ -261,8 +245,6 @@ resources:
             - extraconfig
             - service_names
             - service_configs
-            - ceph_cluster # provided by CephClusterConfig
-            - ceph
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
           merge_behavior: deeper
@@ -282,8 +264,6 @@ resources:
             ceph:
               mapped_data:
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
-                ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
-                ceph::profile::params::public_network: {get_input: ceph_public_network}
 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData:
-- 
cgit 1.2.3-korg