summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-07-24 14:39:23 -0400
committerJames Slagle <jslagle@redhat.com>2017-07-24 14:42:28 -0400
commit59e31ad1f5528ce5cf1f5fbb022eaf89913efb12 (patch)
tree2eef1097f6ca096cf9d4891633796e9826a6f480 /environments
parent6f9f76748c93d88b0f72488a4b841401df3f54b7 (diff)
Consistent hostname format env for split-stack
Adds a new environment split-stack-consistent-hostname-format.j2.yaml for use with split-stack that will set the {{role.name}}HostnameFormat parameters based on the actual roles in use. It's possible to generate these parameters and values as long as the roles files is the same between the 2 stacks, which will be documented in I9997bd685f8f79537dfc377f9f1eb0c7446c3289. Removes the hardcoded paramters from the other 2 split-stack environments. Change-Id: I93bc7c1a24a9cb2f9930372970c67c0eadb14add
Diffstat (limited to 'environments')
-rw-r--r--environments/overcloud-baremetal.j2.yaml7
-rw-r--r--environments/overcloud-services.yaml8
-rw-r--r--environments/split-stack-consistent-hostname-format.j2.yaml5
3 files changed, 5 insertions, 15 deletions
diff --git a/environments/overcloud-baremetal.j2.yaml b/environments/overcloud-baremetal.j2.yaml
index 8d7bc8d9..93191a7b 100644
--- a/environments/overcloud-baremetal.j2.yaml
+++ b/environments/overcloud-baremetal.j2.yaml
@@ -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%
diff --git a/environments/overcloud-services.yaml b/environments/overcloud-services.yaml
index 1d01cb3c..ac1c69f0 100644
--- a/environments/overcloud-services.yaml
+++ b/environments/overcloud-services.yaml
@@ -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%
diff --git a/environments/split-stack-consistent-hostname-format.j2.yaml b/environments/split-stack-consistent-hostname-format.j2.yaml
new file mode 100644
index 00000000..8345c108
--- /dev/null
+++ b/environments/split-stack-consistent-hostname-format.j2.yaml
@@ -0,0 +1,5 @@
+parameter_defaults:
+ # Consistent Hostname format
+{% for role in roles %}
+ {{role.name}}HostnameFormat: overcloud-{{role.name.lower()}}-%index%
+{% endfor %}