Merge "add the code required for hostname_map names"

roles/overcloud-deploy/defaults/main.yml

@@ -72,6 +72,7 @@ timeout_args: "--timeout {{deploy_timeout}}"
 set_overcloud_workers: true
 
 cloud_name_args: ""
+hostnamemap_args: ""
 network_args: ""
 network_isolation_args: ""
 ntp_args: ""
@@ -108,6 +109,7 @@ deploy_args: >-
   {{ timeout_args }}
   {{ ntp_args }}
   {{ cloud_name_args }}
+  {{ hostnamemap_args }}
   {{ multinode_args }}
   {{ pacemaker_args }}
   {{ container_args }}

roles/overcloud-deploy/tasks/create-scripts.yml

@@ -43,6 +43,13 @@
     src: "cloud-names.yaml.j2"
     dest: "{{ working_dir }}/cloud-names.yaml"
 
+- name: Create the hostname_map parameters yaml
+  when:
+    - overcloud_nodes[0].hostnamemap_override is defined
+  template:
+    src: "hostnamemap.yaml.j2"
+    dest: "{{ working_dir }}/hostnamemap.yaml"
+
 - name: Copy nic-configs resource registry template
   when: use_resource_registry_nic_configs|bool
   template:

roles/overcloud-deploy/tasks/pre-deploy.yml

@@ -107,6 +107,13 @@
           -e {{ working_dir }}/cloud-names.yaml
   when: release not in ['mitaka', 'liberty']
 
+- name: Set the hostname_map config if defined
+  set_fact:
+      hostnamemap_args: >-
+          -e {{ working_dir }}/hostnamemap.yaml
+  when:
+    - overcloud_nodes[0].hostnamemap_override is defined
+
 - name: set set overcloud SSL args for releases after mitaka
   set_fact:
     ssl_overcloud_args: >-

roles/overcloud-deploy/templates/hostnamemap.yaml.j2

@@ -0,0 +1,7 @@
+parameter_defaults:
+  HostnameMap:
+{% for node in overcloud_nodes %}
+{% if node.hostnamemap_override is defined %}
+    {{ node.default_name }}: {{ node.hostnamemap_override }}
+{% endif %}
+{% endfor %}