X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fceph-storage-puppet.yaml;h=00dbca015de0241637c654070bd5488f11b05a90;hb=c857f5c877c33938f1167a6538ca535d5d2bba26;hp=4a78da80cc9a1f9f3e6e8ee4e2ead964036ce791;hpb=44a22fc61e24c2efc221edd7085c8f4d44b39fc0;p=apex-tripleo-heat-templates.git

diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml
index 4a78da80..00dbca01 100644
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@@ -1,5 +1,5 @@
-heat_template_version: 2014-10-16
-description: 'Common Ceph Storage Configuration for Puppet'
+heat_template_version: 2015-04-30
+description: 'OpenStack ceph storage node configured by Puppet'
 parameters:
   Flavor:
     description: Flavor for the Ceph Storage node.
@@ -40,6 +40,33 @@ resources:
       networks:
         - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
+      user_data: {get_resource: NodeUserData}
+
+  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_resource: NetworkConfig}
+      server: {get_resource: CephStorage}
+
   CephStorageDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
@@ -52,6 +79,7 @@ resources:
             params:
               server: {get_param: NtpServer}
         enable_package_install: {get_param: EnablePackageInstall}
+
   CephStorageConfig:
     type: OS::Heat::StructuredConfig
     properties:
@@ -63,6 +91,7 @@ resources:
             - cephstorage
             - ceph_cluster # provided by CephClusterConfig
             - ceph
+            - '"%{::osfamily}"'
             - common
           datafiles:
             common:
@@ -78,7 +107,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]}
@@ -86,3 +115,9 @@ outputs:
     description: Heat resource handle for the ceph storage server
     value:
       {get_resource: CephStorage}
+  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]}