openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add services to ServiceNetMap to select hostnames resolution network"

Browse Source
This commit is contained in:
Jenkins 2015-07-10 14:44:35 +00:00 committed by Gerrit Code Review
commit b7400f95a4
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
overcloud-without-mergepy.yaml
View File

@ -552,6 +552,11 @@ parameters:
MysqlNetwork: internal_api MysqlNetwork: internal_api
CephClusterNetwork: storage_mgmt CephClusterNetwork: storage_mgmt
CephPublicNetwork: storage CephPublicNetwork: storage
ControllerHostnameResolveNetwork: internal_api
ComputeHostnameResolveNetwork: internal_api
BlockStorageHostnameResolveNetwork: internal_api
ObjectStorageHostnameResolveNetwork: internal_api
CephStorageHostnameResolveNetwork: storage
description: Mapping of service_name -> network name. Typically set description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. via parameter_defaults in the resource registry.
type: json type: json

9
puppet/ceph-storage-puppet.yaml
View File

@ -76,6 +76,12 @@ resources:
StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, 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: NetIpSubnetMap:
type: OS::TripleO::Network::Ports::NetIpMap type: OS::TripleO::Network::Ports::NetIpMap
properties: properties:
@ -145,7 +151,7 @@ outputs:
str_replace: str_replace:
template: "IP HOST.localdomain HOST" template: "IP HOST.localdomain HOST"
params: params:
IP: {get_attr: [CephStorage, networks, ctlplane, 0]} IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephStorageHostnameResolveNetwork]}]}
HOST: {get_attr: [CephStorage, name]} HOST: {get_attr: [CephStorage, name]}
nova_server_resource: nova_server_resource:
description: Heat resource handle for the ceph storage server description: Heat resource handle for the ceph storage server
@ -160,4 +166,3 @@ outputs:
config_identifier: config_identifier:
description: identifier which changes if the node configuration may need re-applying description: identifier which changes if the node configuration may need re-applying
value: {get_attr: [CephStorageDeployment, deploy_stdout]} value: {get_attr: [CephStorageDeployment, deploy_stdout]}

2
puppet/cinder-storage-puppet.yaml
View File

@ -280,7 +280,7 @@ outputs:
str_replace: str_replace:
template: "IP HOST.localdomain HOST" template: "IP HOST.localdomain HOST"
params: params:
IP: {get_attr: [BlockStorage, networks, ctlplane, 0]} IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, BlockStorageHostnameResolveNetwork]}]}
HOST: {get_attr: [BlockStorage, name]} HOST: {get_attr: [BlockStorage, name]}
nova_server_resource: nova_server_resource:
description: Heat resource handle for the block storage server description: Heat resource handle for the block storage server

3
puppet/compute-puppet.yaml
View File

@ -510,7 +510,7 @@ outputs:
str_replace: str_replace:
template: "IP HOST.localdomain HOST" template: "IP HOST.localdomain HOST"
params: params:
IP: {get_attr: [NovaCompute, networks, ctlplane, 0]} IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ComputeHostnameResolveNetwork]}]}
HOST: {get_attr: [NovaCompute, name]} HOST: {get_attr: [NovaCompute, name]}
nova_server_resource: nova_server_resource:
description: Heat resource handle for the Nova compute server description: Heat resource handle for the Nova compute server
@ -519,4 +519,3 @@ outputs:
config_identifier: config_identifier:
description: identifier which changes if the node configuration may need re-applying description: identifier which changes if the node configuration may need re-applying
value: {get_attr: [NovaComputeDeployment, deploy_stdout]} value: {get_attr: [NovaComputeDeployment, deploy_stdout]}

2
puppet/controller-puppet.yaml
View File

@ -1109,7 +1109,7 @@ outputs:
str_replace: str_replace:
template: IP HOST.localdomain HOST CLOUDNAME template: IP HOST.localdomain HOST CLOUDNAME
params: params:
IP: {get_attr: [Controller, networks, ctlplane, 0]} IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ControllerHostnameResolveNetwork]}]}
HOST: {get_attr: [Controller, name]} HOST: {get_attr: [Controller, name]}
CLOUDNAME: {get_param: CloudName} CLOUDNAME: {get_param: CloudName}
nova_server_resource: nova_server_resource:

3
puppet/swift-storage-puppet.yaml
View File

@ -194,7 +194,7 @@ outputs:
str_replace: str_replace:
template: "IP HOST.localdomain HOST" template: "IP HOST.localdomain HOST"
params: params:
IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]} IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ObjectStorageHostnameResolveNetwork]}]}
HOST: {get_attr: [SwiftStorage, name]} HOST: {get_attr: [SwiftStorage, name]}
nova_server_resource: nova_server_resource:
description: Heat resource handle for the swift storage server description: Heat resource handle for the swift storage server
@ -219,4 +219,3 @@ outputs:
config_identifier: config_identifier:
description: identifier which changes if the node configuration may need re-applying description: identifier which changes if the node configuration may need re-applying
value: {get_attr: [SwiftStorageHieraDeploy, deploy_stdout]} value: {get_attr: [SwiftStorageHieraDeploy, deploy_stdout]}