diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-10 14:44:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-10 14:44:36 +0000 |
commit | b7400f95a4c185c6c1b3294c11af828d799939d0 (patch) | |
tree | ca29943822d7b48988b509c88b3d1cb79afbc0de /puppet/ceph-storage-puppet.yaml | |
parent | 7614af59ce211b6afc31790489b4104067050522 (diff) | |
parent | 57573b77a9ce5a3a465318f4b60d8b8b24264ff1 (diff) |
Merge "Add services to ServiceNetMap to select hostnames resolution network"
Diffstat (limited to 'puppet/ceph-storage-puppet.yaml')
-rw-r--r-- | puppet/ceph-storage-puppet.yaml | 9 |
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]} - |