X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ceph-storage.yaml;h=07d7f568e17900a0403e0fbddbb08af67e8eeb8f;hb=00efb796cd3d63ecbf903c058f7647b77e6bd693;hp=d9134fe6ab60961a0aa1aabac2aa0b2e304812b6;hpb=44a22fc61e24c2efc221edd7085c8f4d44b39fc0;p=apex-tripleo-heat-templates.git

diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index d9134fe6..07d7f568 100644
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@@ -15,19 +15,20 @@ parameters:
   CephClusterFSID:
     default: ''
     type: string
-    description: The Ceph cluster FSID.
+    description: The Ceph cluster FSID. Must be a UUID.
   CephMonKey:
     default: ''
-    description: The Ceph monitors key.
+    description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key.
     type: string
   CephAdminKey:
     default: ''
-    description: The Ceph admin client key.
+    description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
     type: string
   CephMonitors:
     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]}