X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fceph-storage.yaml;h=de5a9c3935756fc9cb86d33fe39294db80f8217d;hb=fab494ed4a89bd7c9fa6207b791922d522cf5cae;hp=2f007536d70a94770c44e08cf7d3c67937a9eb0e;hpb=e06ff3d45b2d92777ee16360ff55d5d4c10ac433;p=apex-tripleo-heat-templates.git

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 2f007536..de5a9c39 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -1,8 +1,9 @@
-heat_template_version: 2015-04-30
+heat_template_version: 2016-10-14
 description: 'OpenStack ceph storage node configured by Puppet'
 parameters:
-  Flavor:
+  OvercloudCephStorageFlavor:
     description: Flavor for the Ceph Storage node.
+    default: baremetal
     type: string
     constraints:
       - custom_constraint: nova.flavor
@@ -21,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
@@ -70,7 +67,6 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
-    default: ''
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain
@@ -108,7 +104,7 @@ resources:
     properties:
       image: {get_param: CephStorageImage}
       image_update_policy: {get_param: ImageUpdatePolicy}
-      flavor: {get_param: Flavor}
+      flavor: {get_param: OvercloudCephStorageFlavor}
       key_name: {get_param: KeyName}
       networks:
         - network: ctlplane
@@ -234,10 +230,23 @@ 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_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
-        ceph_public_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
+        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
@@ -256,27 +265,22 @@ resources:
             - ceph
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
-            - network
           merge_behavior: deeper
           datafiles:
             service_names:
               mapped_data:
                 service_names: {get_param: ServiceNames}
             service_configs:
-              mapped_data: {get_param: ServiceConfigSettings}
-            network:
               mapped_data:
-                net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
-                net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
-                net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
+                map_replace:
+                  - {get_param: ServiceConfigSettings}
+                  - values: {get_attr: [NetIpMap, net_ip_map]}
             ceph_extraconfig:
               mapped_data: {get_param: CephStorageExtraConfig}
             extraconfig:
               mapped_data: {get_param: ExtraConfig}
             ceph:
-              raw_data: {get_file: hieradata/ceph.yaml}
               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}