X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ceph-storage.yaml;h=74530147a1dbe018dd13f3e934498dd3494f33f7;hb=00eb3b3089de1b5b61261f018068fd5daeb631e0;hp=07d7f568e17900a0403e0fbddbb08af67e8eeb8f;hpb=04027e783f8aa4d8f1c56c7f2b50ac49ba16194d;p=apex-tripleo-heat-templates.git

diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index 07d7f568..74530147 100644
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Common Ceph Storage Configuration'
 parameters:
   Image:
@@ -45,13 +45,26 @@ resources:
   NodeUserData:
     type: OS::TripleO::NodeUserData
 
+  StoragePort:
+    type: OS::TripleO::CephStorage::Ports::StoragePort
+    properties:
+      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
+
+  StorageMgmtPort:
+    type: OS::TripleO::CephStorage::Ports::StorageMgmtPort
+    properties:
+      ControlPlaneIP: {get_attr: [CephStorage, networks, ctlplane, 0]}
+
   NetworkConfig:
     type: OS::TripleO::CephStorage::Net::SoftwareConfig
+    properties:
+      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
+      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
 
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
     properties:
-      config: {get_attr: [NetworkConfig, config_id]}
+      config: {get_resource: NetworkConfig}
       server: {get_resource: CephStorage}
 
   CephStorageDeployment:
@@ -118,3 +131,9 @@ outputs:
         params:
           IP: {get_attr: [CephStorage, networks, ctlplane, 0]}
           HOST: {get_attr: [CephStorage, name]}
+  storage_ip_address:
+    description: IP address of the server in the storage network
+    value: {get_attr: [StoragePort, ip_address]}
+  storage_mgmt_ip_address:
+    description: IP address of the server in the storage_mgmt network
+    value: {get_attr: [StorageMgmtPort, ip_address]}