X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=swift-storage.yaml;h=68923eef958882140b654f7e4efd5d3926dfb3b8;hb=dbc6acf03e24bcf6db0a7ed8863efc77856650c7;hp=7160c14d1d3b29b714d73a51c6fbf61e8deb743e;hpb=630fef16a584b130e4aea03b0909ac54ab537ac0;p=apex-tripleo-heat-templates.git

diff --git a/swift-storage.yaml b/swift-storage.yaml
index 7160c14d..68923eef 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Common Swift Storage Configuration'
 parameters:
   ExtraConfig:
@@ -116,13 +116,32 @@ resources:
   NodeUserData:
     type: OS::TripleO::NodeUserData
 
+  InternalApiPort:
+    type: OS::TripleO::SwiftStorage::Ports::InternalApiPort
+    properties:
+      ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
+
+  StoragePort:
+    type: OS::TripleO::SwiftStorage::Ports::StoragePort
+    properties:
+      ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
+
+  StorageMgmtPort:
+    type: OS::TripleO::SwiftStorage::Ports::StorageMgmtPort
+    properties:
+      ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
+
   NetworkConfig:
     type: OS::TripleO::ObjectStorage::Net::SoftwareConfig
+    properties:
+      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
+      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: SwiftStorage}
 
   SwiftStorageDeploy:
@@ -145,7 +164,7 @@ outputs:
   hosts_entry:
     value:
       str_replace:
-        template: "IP HOST HOST.novalocal"
+        template: "IP HOST"
         params:
           IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
           HOST: {get_attr: [SwiftStorage, name]}
@@ -160,3 +179,12 @@ outputs:
         template: 'r1z1-IP:%PORT%/d1'
         params:
           IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
+  internal_api_ip_address:
+    description: IP address of the server in the internal_api network
+    value: {get_attr: [InternalApiPort, ip_address]}
+  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]}