diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index f4a2c4b8ea..9e5ee0375a 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -521,7 +521,7 @@ outputs:
 
                         {% endif %}
 
-                  - name: generate openshift validation playbook
+                  - name: generate openshift playbook for etcd scaleup
                     copy:
                       dest: "{{playbook_dir}}/openshift/playbook.yml"
                       content: |
@@ -536,6 +536,23 @@ outputs:
                       {{openshift_command}} 2>&1 | tee {{playbook_dir}}/openshift/playbook-etcd.log
                       exit ${PIPESTATUS[0]}
 
+                - name: generate post-deployment inventory for master nodes
+                  copy:
+                    dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_openshift_master.yml"
+                    content: |
+                      {% if (role_nodes[tripleo_role_name] + new_role_nodes[tripleo_role_name]) | count > 0%}
+                      all:
+                        children:
+                          masters:
+                            hosts:
+                              {% for host in (role_nodes[tripleo_role_name] + new_role_nodes[tripleo_role_name]) -%}
+                              {{host.hostname}}:
+                              {% endfor %}
+
+                            vars:
+                              {{openshift_master_node_vars | to_nice_yaml() | indent(6)}}
+                      {% endif %}
+
                 - name: generate openshift validation playbook
                   copy:
                     dest: "{{playbook_dir}}/openshift/playbook.yml"
diff --git a/extraconfig/services/openshift-node.yaml b/extraconfig/services/openshift-node.yaml
index 3456bc1bd2..bc915f39c7 100644
--- a/extraconfig/services/openshift-node.yaml
+++ b/extraconfig/services/openshift-node.yaml
@@ -172,3 +172,24 @@ outputs:
                       {% endif %}
 
                   {% endif %}
+        - name: openshift_node step 4
+          when: step == '4'
+          tags: openshift
+          block:
+            - name: set role facts for generating inventory
+              set_fact:
+                tripleo_role_name: {get_param: RoleName}
+
+            - name: generate post-deployment inventory for {{tripleo_role_name}} role groups
+              copy:
+                dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_groups.yml"
+                content: |
+                  {% if (role_nodes[tripleo_role_name] + new_role_nodes[tripleo_role_name]) | count > 0%}
+                  all:
+                    children:
+                      nodes:
+                        hosts:
+                          {% for host in (role_nodes[tripleo_role_name] + new_role_nodes[tripleo_role_name]) -%}
+                          {{host.hostname}}:
+                          {% endfor %}
+                  {% endif %}