openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Consistent hostname format env for split-stack"

This commit is contained in:
Jenkins 2017-07-28 02:57:20 +00:00 committed by Gerrit Code Review
parent 8a8369d868 59e31ad1f5
commit 19e89d8d6e
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
environments/overcloud-baremetal.j2.yaml
View File

@ -11,10 +11,3 @@ parameter_defaults:
{% for role in roles %}
{{role.name}}Services: []
{% endfor %}
# Consistent Hostname format
ControllerHostnameFormat: overcloud-controller-%index%
ComputeHostnameFormat: overcloud-novacompute-%index%
ObjectStorageHostnameFormat: overcloud-objectstorage-%index%
CephStorageHostnameFormat: overcloud-cephstorage-%index%
BlockStorageHostnameFormat: overcloud-blockstorage-%index%

8
environments/overcloud-services.yaml
View File

@ -1,10 +1,2 @@
resource_registry:
OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml
parameter_defaults:
# Consistent Hostname format
ControllerDeployedServerHostnameFormat: overcloud-controller-%index%
ComputeDeployedServerHostnameFormat: overcloud-novacompute-%index%
ObjectStorageDeployedServerHostnameFormat: overcloud-objectstorage-%index%
CephStorageDeployedServerHostnameFormat: overcloud-cephstorage-%index%
BlockStorageDeployedServerHostnameFormat: overcloud-blockstorage-%index%

5
environments/split-stack-consistent-hostname-format.j2.yaml Normal file
View File

@ -0,0 +1,5 @@
parameter_defaults:
# Consistent Hostname format
{% for role in roles %}
{{role.name}}HostnameFormat: overcloud-{{role.name.lower()}}-%index%
{% endfor %}