summaryrefslogtreecommitdiffstats
path: root/puppet/ceph-storage-puppet.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/ceph-storage-puppet.yaml')
-rw-r--r--puppet/ceph-storage-puppet.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml
index 245d8ebb..2d089419 100644
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@@ -76,6 +76,12 @@ resources:
StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
+ NetIpMap:
+ type: OS::TripleO::Network::Ports::NetIpMap
+ properties:
+ StorageIp: {get_attr: [StoragePort, ip_address]}
+ StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}
+
NetIpSubnetMap:
type: OS::TripleO::Network::Ports::NetIpMap
properties:
@@ -145,7 +151,7 @@ outputs:
str_replace:
template: "IP HOST.localdomain HOST"
params:
- IP: {get_attr: [CephStorage, networks, ctlplane, 0]}
+ IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephStorageHostnameResolveNetwork]}]}
HOST: {get_attr: [CephStorage, name]}
nova_server_resource:
description: Heat resource handle for the ceph storage server
@@ -160,4 +166,3 @@ outputs:
config_identifier:
description: identifier which changes if the node configuration may need re-applying
value: {get_attr: [CephStorageDeployment, deploy_stdout]}
-