Remove usage of ::nova class in THT

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

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 2849396..77ca4dc 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -91,10 +91,20 @@ parameters:
   ServiceConfigSettings:
     type: json
     default: {}
+  ServiceNames:
+    type: comma_delimited_list
+    default: []
+  ConfigCommand:
+    type: string
+    description: Command which will be run whenever configuration data changes
+    default: os-refresh-config --timeout 14400
 
 resources:
   CephStorage:
-    type: OS::Nova::Server
+    type: OS::TripleO::Server
+    metadata:
+      os-collect-config:
+        command: {get_param: ConfigCommand}
     properties:
       image: {get_param: Image}
       image_update_policy: {get_param: ImageUpdatePolicy}
@@ -240,14 +250,19 @@ resources:
             - heat_config_%{::deploy_config_name}
             - ceph_extraconfig
             - extraconfig
+            - service_names
             - service_configs
             - ceph_cluster # provided by CephClusterConfig
             - ceph
+            - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - common
             - network
           merge_behavior: deeper
           datafiles:
+            service_names:
+              mapped_data:
+                service_names: {get_param: ServiceNames}
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             common:
@@ -304,6 +319,12 @@ resources:
           get_param: UpdateIdentifier
 
 outputs:
+  ip_address:
+    description: IP address of the server in the ctlplane network
+    value: {get_attr: [CephStorage, networks, ctlplane, 0]}
+  hostname:
+    description: Hostname of the server
+    value: {get_attr: [CephStorage, name]}
   hosts_entry:
     value:
       str_replace:
@@ -377,12 +398,3 @@ outputs:
   management_ip_address:
     description: IP address of the server in the management network
     value: {get_attr: [ManagementPort, ip_address]}
-  config_identifier:
-    description: identifier which changes if the node configuration may need re-applying
-    value:
-      list_join:
-      - ','
-      - - {get_attr: [CephStorageDeployment, deploy_stdout]}
-        - {get_attr: [NodeTLSCAData, deploy_stdout]}
-        - {get_attr: [CephStorageExtraConfigPre, deploy_stdout]}
-        - {get_param: UpdateIdentifier}