diff --git a/roles/tripleo_overcloud_node_provision/defaults/main.yml b/roles/tripleo_overcloud_node_provision/defaults/main.yml
index 49099bd..9f88410 100644
--- a/roles/tripleo_overcloud_node_provision/defaults/main.yml
+++ b/roles/tripleo_overcloud_node_provision/defaults/main.yml
@@ -5,6 +5,7 @@ tripleo_overcloud_node_provision_concurrency:
 tripleo_overcloud_node_provision_debug: false
 tripleo_overcloud_node_provision_deployment_file:
 tripleo_overcloud_node_provision_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}"
+tripleo_overcloud_node_provision_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}"
 tripleo_overcloud_node_provision_home_dir: "{{ ansible_env.HOME }}"
 tripleo_overcloud_node_provision_log: "{{ tripleo_overcloud_node_provision_home_dir }}/overcloud_node_provision.log"
 tripleo_overcloud_node_provision_log_combine: true
diff --git a/roles/tripleo_overcloud_node_provision/tasks/main.yml b/roles/tripleo_overcloud_node_provision/tasks/main.yml
index 0a300e2..bc77fb9 100644
--- a/roles/tripleo_overcloud_node_provision/tasks/main.yml
+++ b/roles/tripleo_overcloud_node_provision/tasks/main.yml
@@ -40,6 +40,13 @@
       debug:
         var: _provision_env
 
+- name: Write reproducer script
+  tripleo_shell_script:
+    dest: "{{ tripleo_overcloud_node_provision_home_dir }}/tripleo_overcloud_node_provision.sh"
+    shell_command: "{{ _provision_cmd }}"
+    shell_environment: "{{ _provision_env }}"
+  when: tripleo_overcloud_node_provision_generate_scripts|bool
+
 - name: overcloud node provision
   shell: "{{ _provision_cmd }}"  # noqa 305
   environment: "{{ _provision_env }}"
@@ -51,7 +58,9 @@
   async: "{{ tripleo_overcloud_node_provision_timeout }}"
   poll: "{{ tripleo_overcloud_node_provision_poll }}"
   changed_when: false
-  when: not ansible_check_mode|bool
+  when:
+    - not ansible_check_mode|bool
+    - not tripleo_overcloud_node_provision_generate_scripts_only|bool
 
 
 - name: Set output fact