Merge "Add HostnameMap to allow granular control of hostnames"

1 files changed, 8 insertions, 1 deletions

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index dedd5142..440c2fd2 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -89,6 +89,10 @@ parameters:
   Hostname:
     type: string
     default: '' # Defaults to Heat created hostname
+  HostnameMap:
+    type: json
+    default: {}
+    description: Optional mapping to override hostnames
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -151,7 +155,10 @@ resources:
         - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
       user_data: {get_resource: UserData}
-      name: {get_param: Hostname}
+      name:
+        str_replace:
+            template: {get_param: Hostname}
+            params: {get_param: HostnameMap}
       software_config_transport: {get_param: SoftwareConfigTransport}
       metadata: {get_param: ServerMetadata}
       scheduler_hints: {get_param: SchedulerHints}