tripleo.mitaka.diff

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 54074d1..f7ccf04 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -52,6 +52,9 @@ resource_registry:
   # node configuration in the pre_deploy step.
   OS::TripleO::AllNodesExtraConfig: extraconfig/all_nodes/default.yaml
 
+  # "AllNodes" Extra cluster config, runs on all nodes prior to the post_deploy
+  OS::TripleO::AllNodesExtraConfigPost: extraconfig/all_nodes/default.yaml
+
   # TripleO overcloud networks
   OS::TripleO::Network: network/networks.yaml
   OS::TripleO::VipConfig: puppet/vip-config.yaml
diff --git a/overcloud.yaml b/overcloud.yaml
index ae1d6e7..caedd94 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -1701,6 +1701,24 @@ resources:
         cephstorage_config: {get_attr: [CephStorage, attributes, config_identifier]}
         deployment_identifier: {get_param: DeployIdentifier}
 
+  # Optional ExtraConfigPost for all nodes - all roles are passed in here, but
+  # the nested template may configure each role differently (or not at all)
+  AllNodesExtraConfigPost:
+    type: OS::TripleO::AllNodesExtraConfigPost
+    depends_on:
+      - ControllerNodesPostDeployment
+      - ComputeNodesPostDeployment
+      - ObjectStorageNodesPostDeployment
+      - BlockStorageNodesPostDeployment
+      - CephStorageNodesPostDeployment
+    properties:
+      Controller_servers: {get_attr: [Controller, attributes, nova_server_resource]}
+      Compute_servers: {get_attr: [Compute, attributes, nova_server_resource]}
+      BlockStorage_servers: {get_attr: [BlockStorage, attributes, nova_server_resource]}
+      ObjectStorage_servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}
+      CephStorage_servers: {get_attr: [CephStorage, attributes, nova_server_resource]}
+      public_vip: {get_attr: [VipMap, net_ip_map, external]}
+
 outputs:
   KeystoneURL:
     description: URL for the Overcloud Keystone service