Merge "Also match config volumes for /var/lib/config-data/puppet-generated/" into...

[apex-tripleo-heat-templates.git] / environments / overcloud-baremetal.j2.yaml

diff --git a/environments/overcloud-baremetal.j2.yaml b/environments/overcloud-baremetal.j2.yaml
index 668e28d..93191a7 100644 (file)
--- a/environments/overcloud-baremetal.j2.yaml
+++ b/environments/overcloud-baremetal.j2.yaml
@@ -4,16 +4,10 @@ resource_registry:
   OS::TripleO::DefaultPasswords: OS::Heat::None
   OS::TripleO::RandomString: OS::Heat::None
   OS::TripleO::AllNodesDeployment: OS::Heat::None
+  OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml
 
 parameter_defaults:
   # Deploy no services
 {% 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%