diff --git a/releasenotes/notes/create-overcloudrc-workflow-e5150b6b0af462f0.yaml b/releasenotes/notes/create-overcloudrc-workflow-e5150b6b0af462f0.yaml
new file mode 100644
index 000000000..9585d5461
--- /dev/null
+++ b/releasenotes/notes/create-overcloudrc-workflow-e5150b6b0af462f0.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds a workflow to generate the overcloudrc files in a given deployment
+    so the tripleo.deployment.overcloudrc action does not need to be called
+    directly.
diff --git a/workbooks/deployment.yaml b/workbooks/deployment.yaml
index f6d7ede19..5853740be 100644
--- a/workbooks/deployment.yaml
+++ b/workbooks/deployment.yaml
@@ -410,3 +410,42 @@ workflows:
                 execution: <% execution() %>
         on-success:
           - fail: <% $.get('status') = "FAILED" %>
+
+  create_overcloudrc:
+    description: >
+      Given the name of a container, generate the overcloudrc files
+      needed to access the overcloud via the CLI.
+
+    tags:
+      - tripleo-common-managed
+
+    input:
+      - container: overcloud
+      - queue_name: tripleo
+
+    tasks:
+      generate_overcloud_rc:
+        action: tripleo.deployment.overcloudrc
+        input:
+          container: <% $.container %>
+        on-complete: notify_zaqar
+        publish-on-error:
+          status: FAILED
+          message: <% task().result %>
+        publish:
+          status: SUCCESS
+          message: <% task().result %>
+
+      notify_zaqar:
+        action: zaqar.queue_post
+        input:
+          queue_name: <% $.queue_name %>
+          messages:
+            body:
+              type: tripleo.deployment.v1.create_overcloudrc
+              payload:
+                status: <% $.status %>
+                message: <% $.get('message', '') %>
+                execution: <% execution() %>
+        on-success:
+          - fail: <% $.get('status') = "FAILED" %>