diff --git a/content/automate/ManageIQ/Cloud/Orchestration/Reconfiguration/StateMachines/Reconfigure.class/__class__.yaml b/content/automate/ManageIQ/Cloud/Orchestration/Reconfiguration/StateMachines/Reconfigure.class/__class__.yaml
index ac40ae0d3..a3f264716 100644
--- a/content/automate/ManageIQ/Cloud/Orchestration/Reconfiguration/StateMachines/Reconfigure.class/__class__.yaml
+++ b/content/automate/ManageIQ/Cloud/Orchestration/Reconfiguration/StateMachines/Reconfigure.class/__class__.yaml
@@ -263,7 +263,7 @@ object:
datatype: string
priority: 13
owner:
- default_value: "/Cloud/Orchestration/Reconfiguration/Email/ServiceReconfigure_complete?event=service_reconfigured"
+ default_value: "/System/Notification/Email/CloudOrchestrationServiceReconfigureComplete?event=service_reconfigured"
substitute: true
message: create
visibility:
diff --git a/content/automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml
index 2222e4919..a9eaed080 100644
--- a/content/automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml
+++ b/content/automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml
@@ -178,7 +178,7 @@ object:
datatype: string
priority: 9
owner:
- default_value: "/Infrastructure/VM/Migrate/Email/VmMigrateTask_Complete?event=vm_migrated"
+ default_value: "/System/Notification/Email/VmMigrateTaskComplete?event=vm_migrated"
substitute: true
message: create
visibility:
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigureapproverapproved.yaml b/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigureapproverapproved.yaml
new file mode 100644
index 000000000..79d458875
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigureapproverapproved.yaml
@@ -0,0 +1,18 @@
+---
+object_type: instance
+version: 1.0
+object:
+ attributes:
+ display_name:
+ name: CloudOrchestrationServiceReconfigureApproverApproved
+ inherits:
+ description:
+ fields:
+ - subject:
+ value: Request ID ${/#miq_request.id} - Service Reconfigure Request from ${/#miq_request.requester.email}
+ was Approved.
+ - body:
+ value: 'Approver,
A Service Reconfigure Request received from ${/#miq_request.requester.email}
+ was Approved.
Approvers reason : ${/#miq_request.reason}
To
+ view this Request go to : ${/#miq_request.show_url}
+ Thank you,
${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigurecomplete.yaml b/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigurecomplete.yaml
new file mode 100644
index 000000000..e6cedb273
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigurecomplete.yaml
@@ -0,0 +1,21 @@
+---
+object_type: instance
+version: 1.0
+object:
+ attributes:
+ display_name:
+ name: CloudOrchestrationServiceReconfigureComplete
+ inherits:
+ description:
+ fields:
+ - to:
+ value: "${/#miq_provision.miq_request.get_option(:owner_email)} || ${/#miq_provision.miq_request.requester.email}
+ || ${/Configuration/Email/Default#default_recipient}"
+ - subject:
+ value: Request ID ${/#miq_request.id} - Your Service Reconfigure Request has
+ Completed.
+ - body:
+ value: Hello,
Your Service Reconfigure Request has Completed.
+ Thank you
${#signature}
+ - mail_method:
+ value: "#stop_email"
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigurerequesterapproved.yaml b/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigurerequesterapproved.yaml
new file mode 100644
index 000000000..ac2380e90
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/cloudorchestrationservicereconfigurerequesterapproved.yaml
@@ -0,0 +1,20 @@
+---
+object_type: instance
+version: 1.0
+object:
+ attributes:
+ display_name:
+ name: CloudOrchestrationServiceReconfigureRequesterApproved
+ inherits:
+ description:
+ fields:
+ - to:
+ value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+ || ${/Configuration/Email/Default#default_recipient}"
+ - subject:
+ value: Request ID ${/#miq_request.id} - Your Service Reconfigure Request was
+ Approved.
+ - body:
+ value: 'Hello,
Your Service Reconfigure Request was Approved.
To
+ view this Request go to : ${/#miq_request.show_url}
+ Thank you,
${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/vmmigraterequestapproved.yaml b/content/automate/ManageIQ/System/Notification/Email.class/vmmigraterequestapproved.yaml
new file mode 100644
index 000000000..aeb12b129
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/vmmigraterequestapproved.yaml
@@ -0,0 +1,21 @@
+---
+object_type: instance
+version: 1.0
+object:
+ attributes:
+ display_name:
+ name: VmMigrateRequestApproved
+ inherits:
+ description:
+ fields:
+ - to:
+ value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+ || ${/Configuration/Email/Default#default_recipient}"
+ - subject:
+ value: Request ID ${/#miq_request.id} - Your Virtual Machine Migration Request
+ has been Approved.
+ - body:
+ value: 'Hello,
Your Virtual Machine Request was Approved. You will
+ be notified via email when the VM(s) have been migrated.
To view
+ this Request go to : ${/#miq_request.show_url}
+ Thank you,
${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/vmmigratetaskcomplete.yaml b/content/automate/ManageIQ/System/Notification/Email.class/vmmigratetaskcomplete.yaml
new file mode 100644
index 000000000..e7eaf0d46
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/vmmigratetaskcomplete.yaml
@@ -0,0 +1,23 @@
+---
+object_type: instance
+version: 1.0
+object:
+ attributes:
+ display_name:
+ name: VmMigrateTaskComplete
+ inherits:
+ description:
+ fields:
+ - to:
+ value: "${/#vm.owner.email} || ${/#vm_migrate_task.get_option(:owner_email)}
+ || ${/#vm_migrate_task.requester.email} || ${/#vm_migrate.get_option(:owner_email)}
+ || ${/#vm_migrate.requester.email} || ${/Configuration/Email/Default#default_recipient}"
+ - subject:
+ value: Request ID ${/#vm_migrate_task.miq_request.id} - Your Virtual Machine
+ Migration Request has Completed.
+ - body:
+ value: Hello,
Your Request to Migrate Virtual Machine ${/#vm_migrate_task.source}
+ has Completed.
If you are not already logged in, you can access
+ and manage your host here ${/#host.show_url}
+
If you have any issues with your new host please contact Support.
+
Thank you,
${#signature}
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/vmreconfigurerequestapproved.yaml b/content/automate/ManageIQ/System/Notification/Email.class/vmreconfigurerequestapproved.yaml
new file mode 100644
index 000000000..a70b75500
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/vmreconfigurerequestapproved.yaml
@@ -0,0 +1,19 @@
+---
+object_type: instance
+version: 1.0
+object:
+ attributes:
+ display_name:
+ name: VmReconfigureRequestApproved
+ inherits:
+ description:
+ fields:
+ - to:
+ value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+ || ${/Configuration/Email/Default#default_recipient}"
+ - subject:
+ value: Request ID ${/#miq_request.id} - Your Virtual Machine Reconfigure Request
+ was Approved.
+ - body:
+ value: Hello,
Your Virtual Machine Reconfiguration Request was Approved.
+ Thank you
${#signature}
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/vmreconfiguretaskcomplete.yaml b/content/automate/ManageIQ/System/Notification/Email.class/vmreconfiguretaskcomplete.yaml
new file mode 100644
index 000000000..7cc944b3a
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/vmreconfiguretaskcomplete.yaml
@@ -0,0 +1,19 @@
+---
+object_type: instance
+version: 1.0
+object:
+ attributes:
+ display_name:
+ name: VmReconfigureTaskComplete
+ inherits:
+ description:
+ fields:
+ - to:
+ value: "${/#miq_provision.miq_request.get_option(:owner_email)} || ${/#miq_provision.miq_request.requester.email}
+ || ${/Configuration/Email/Default#default_recipient}"
+ - subject:
+ value: Request ID ${/#miq_request.id} - Your Virtual Machine Reconfigure Request
+ has Completed.
+ - body:
+ value: Hello,
Your Virtual Machine Reconfiguration Request has Completed.
+ Thank you
${#signature}
diff --git a/content/automate/ManageIQ/System/Policy.class/vmmigraterequest_approved.yaml b/content/automate/ManageIQ/System/Policy.class/vmmigraterequest_approved.yaml
index 680b3f45b..d529f12fe 100644
--- a/content/automate/ManageIQ/System/Policy.class/vmmigraterequest_approved.yaml
+++ b/content/automate/ManageIQ/System/Policy.class/vmmigraterequest_approved.yaml
@@ -9,4 +9,4 @@ object:
description:
fields:
- rel5:
- value: "/Infrastructure/VM/Migrate/Email/VmMigrateRequest_Approved"
+ value: "/System/Notification/Email/VmMigrateRequestApproved"
diff --git a/content/automate/ManageIQ/System/Policy.class/vmreconfigurerequest_approved.yaml b/content/automate/ManageIQ/System/Policy.class/vmreconfigurerequest_approved.yaml
index d95cfc4b9..36feaeccb 100644
--- a/content/automate/ManageIQ/System/Policy.class/vmreconfigurerequest_approved.yaml
+++ b/content/automate/ManageIQ/System/Policy.class/vmreconfigurerequest_approved.yaml
@@ -9,4 +9,4 @@ object:
description:
fields:
- rel5:
- value: "/Infrastructure/VM/Reconfigure/Email/VmReconfigureRequestApproved"
+ value: "/System/Notification/Email/VmReconfigureRequestApproved"