diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-21 15:44:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-21 15:44:08 +0000 |
| commit | 566410cea8ea0cf96fc38287bf2fa581b06f66b2 (patch) | |
| tree | f9b64ce5c515c7752db87ac7f182e65179caf101 | |
| parent | 5720819516b0aab1e535cde747875183662eb9ff (diff) | |
| parent | dfcd5b7f53af9f9f059c90bb9b87b94bf82ea7b7 (diff) | |
Merge "Don't write CLOUDNAME to the hosts file."
| -rw-r--r-- | overcloud.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller.yaml | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index d63549a9..b3978048 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -859,7 +859,6 @@ resources: CinderEnableNfsBackend: {get_param: CinderEnableNfsBackend} CinderEnableIscsiBackend: {get_param: CinderEnableIscsiBackend} CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend} - CloudName: {get_param: CloudName} CloudDomain: {get_param: CloudDomain} ControlVirtualInterface: {get_param: ControlVirtualInterface} ControllerExtraConfig: {get_param: controllerExtraConfig} 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: |