diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/group_vars/overcloud.json b/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/group_vars/overcloud.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/group_vars/overcloud.json
@@ -0,0 +1 @@
+{}
diff --git a/tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml b/tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml
index 6192c3c5a..88acdd78e 100644
--- a/tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml
+++ b/tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml
@@ -14,8 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+- name: Copy overcloud.json to all_nodes.json
+  copy:
+    src: "{{ playbook_dir }}/group_vars/overcloud.json"
+    dest: "{{ dest_path | default('/etc/puppet/hieradata/all_nodes.json') }}"
+
 - name: Render hieradata from template
   template:
     src: templates/{{ item }}.j2
     dest: "{{ dest_path | default('/etc/puppet/hieradata/' ~ item ~ '.json') }}"
-  loop: "{{ hieradata_templates_list }}"
+  loop: "{{ hieradata_templates_list | difference(['all_nodes']) }}"