X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fceph-storage.yaml;h=829456b5b162a1b618b0b56349967f84d7ee5a73;hb=6a2582fee25d0cc0c7193a89541d31fb3c2ac0e0;hp=de5a9c3935756fc9cb86d33fe39294db80f8217d;hpb=0df577c6f0acc672b53d470e4cfedb1d7d9c53d1;p=apex-tripleo-heat-templates.git

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: