Merge "Added DPDK environment file and nic configs samples"

[apex-tripleo-heat-templates.git] / puppet / ceph-storage.yaml

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 659f2a6..829456b 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -22,10 +22,6 @@ parameters:
     default: default
     constraints:
       - custom_constraint: nova.keypair
-  EnablePackageInstall:
-    default: 'false'
-    description: Set to true to enable package installation via Puppet
-    type: boolean
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -234,24 +230,7 @@ resources:
       config: {get_resource: CephStorageConfig}
       server: {get_resource: CephStorage}
       input_values:
-        enable_package_install: {get_param: EnablePackageInstall}
         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
@@ -266,8 +245,6 @@ resources:
             - extraconfig
             - service_names
             - service_configs
-            - ceph_cluster # provided by CephClusterConfig
-            - ceph
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
           merge_behavior: deeper
@@ -286,10 +263,7 @@ resources:
               mapped_data: {get_param: ExtraConfig}
             ceph:
               mapped_data:
-                tripleo::packages::enable_install: {get_input: enable_package_install}
                 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: