aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-21 15:44:08 +0000
committerGerrit Code Review <review@openstack.org>2016-01-21 15:44:08 +0000
commit566410cea8ea0cf96fc38287bf2fa581b06f66b2 (patch)
treef9b64ce5c515c7752db87ac7f182e65179caf101 /puppet
parent5720819516b0aab1e535cde747875183662eb9ff (diff)
parentdfcd5b7f53af9f9f059c90bb9b87b94bf82ea7b7 (diff)
Merge "Don't write CLOUDNAME to the hosts file."
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml7
1 files changed, 1 insertions, 6 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 70145010..d0394757 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -89,10 +89,6 @@ parameters:
default: 0
description: Number of workers for Cinder service.
type: number
- CloudName:
- default: overcloud
- description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
- type: string
ControllerExtraConfig:
default: {}
description: |
@@ -1602,12 +1598,11 @@ outputs:
Server's IP address and hostname in the /etc/hosts format
value:
str_replace:
- template: IP HOST.DOMAIN HOST CLOUDNAME
+ template: IP HOST.DOMAIN HOST
params:
IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ControllerHostnameResolveNetwork]}]}
DOMAIN: {get_param: CloudDomain}
HOST: {get_attr: [Controller, name]}
- CLOUDNAME: {get_param: CloudName}
nova_server_resource:
description: Heat resource handle for the Nova compute server
value: