Merge "Use pacemaker::resource::service instead of ::systemd"

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

diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index d047488..07d7f56 100644 (file)
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@@ -28,6 +28,7 @@ parameters:
     default: ''
     description: The list of ip/names to use as Ceph monitors
     type: json
+
 resources:
   CephStorage:
     type: OS::Nova::Server
@@ -36,9 +37,23 @@ resources:
         {get_param: Image}
       flavor: {get_param: OvercloudCephStorageFlavor}
       key_name: {get_param: KeyName}
-      user_data_format: SOFTWARE_CONFIG
       networks:
         - network: ctlplane
+      user_data_format: SOFTWARE_CONFIG
+      user_data: {get_resource: NodeUserData}
+
+  NodeUserData:
+    type: OS::TripleO::NodeUserData
+
+  NetworkConfig:
+    type: OS::TripleO::CephStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: CephStorage}
+
   CephStorageDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
@@ -99,7 +114,7 @@ outputs:
   hosts_entry:
     value:
       str_replace:
-        template: "IP HOST HOST.novalocal"
+        template: "IP HOST"
         params:
           IP: {get_attr: [CephStorage, networks, ctlplane, 0]}
           HOST: {get_attr: [CephStorage, name]}