Merge pull request ManageIQ#98 from billfitzgerald0120/ae_reason_to_s…

…tring Changed ${/#ae_reason} to a string value in on_error methods.
mkanoor · May 4, 2017 · b92d4a4 · b92d4a4
2 parents 19769b9 + 595a237
commit b92d4a4
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 24 deletions.
diff --git a/...Management/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml b/...Management/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml
@@ -148,7 +148,7 @@ object:
       condition: 
       on_entry: update_serviceprovision_status(status => 'Launching Job')
       on_exit: update_serviceprovision_status(status => 'Launching Job')
-      on_error: update_serviceprovision_status(status => '${/#ae_reason}')
+      on_error: update_serviceprovision_status(status => 'Error Launching Job')
       max_retries: '100'
       max_time: 
   - field:
@@ -168,7 +168,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_serviceprovision_status(status => 'Launching Job')
-      on_error: update_serviceprovision_status(status => '${/#ae_reason}')
+      on_error: update_serviceprovision_status(status => 'Error Launching Job')
       max_retries: '100'
       max_time: 
   - field:

diff --git a/...te/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml b/...te/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml
@@ -148,7 +148,7 @@ object:
       condition: 
       on_entry: update_serviceprovision_status(status => 'Creating Stack')
       on_exit: update_serviceprovision_status(status => 'Creating Stack')
-      on_error: update_serviceprovision_status(status => '${/#ae_reason}')
+      on_error: update_serviceprovision_status(status => 'Error Creating Stack')
       max_retries: '100'
       max_time: 
   - field:
@@ -168,7 +168,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_serviceprovision_status(status => 'Creating Stack')
-      on_error: update_serviceprovision_status(status => '${/#ae_reason}')
+      on_error: update_serviceprovision_status(status => 'Error Creating Stack')
       max_retries: '100'
       max_time: 
   - field:

diff --git a/...nageIQ/Cloud/Orchestration/Reconfiguration/StateMachines/Reconfigure.class/__class__.yaml b/...nageIQ/Cloud/Orchestration/Reconfiguration/StateMachines/Reconfigure.class/__class__.yaml
@@ -128,7 +128,7 @@ object:
       condition: 
       on_entry: update_servicereconfigure_status(status => 'Updating Stack')
       on_exit: update_servicereconfigure_status(status => 'Updating Stack')
-      on_error: update_servicereconfigure_status(status => '${/#ae_reason}')
+      on_error: update_servicereconfigure_status(status => 'Error Updating Stack')
       max_retries: '100'
       max_time: 
   - field:
@@ -148,7 +148,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_servicereconfigure_status(status => 'Updating Stack')
-      on_error: update_servicereconfigure_status(status => '${/#ae_reason}')
+      on_error: update_servicereconfigure_status(status => 'Error Updating Stack')
       max_retries: '100'
       max_time: 
   - field:

diff --git a/...automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml b/...automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml
@@ -208,7 +208,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_provision_status(status => 'Creating VM')
-      on_error: update_provision_status(status => '${/#ae_reason}')
+      on_error: update_provision_status(status => 'Error Creating VM')
       max_retries: '100'
       max_time: 
   - field:
@@ -296,7 +296,7 @@ object:
       name: Finished
       display_name: 
       datatype: string
-      priority: 16
+      priority: 15
       owner: 
       default_value: "/System/CommonMethods/StateMachineMethods/vm_provision_finished"
       substitute: true

diff --git a/...Management/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml b/...Management/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml
@@ -148,7 +148,7 @@ object:
       condition: 
       on_entry: update_serviceprovision_status(status => 'Launching Job')
       on_exit: update_serviceprovision_status(status => 'Launching Job')
-      on_error: update_serviceprovision_status(status => '${/#ae_reason}')
+      on_error: update_serviceprovision_status(status => 'Error Launching Job')
       max_retries: '100'
       max_time: 
   - field:
@@ -168,7 +168,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_serviceprovision_status(status => 'Launching Job')
-      on_error: update_serviceprovision_status(status => '${/#ae_reason}')
+      on_error: update_serviceprovision_status(status => 'Error Launching Job')
       max_retries: '100'
       max_time: 
   - field:

diff --git a/...nfrastructure/Configured_System/Provisioning/StateMachines/Provision.class/__class__.yaml b/...nfrastructure/Configured_System/Provisioning/StateMachines/Provision.class/__class__.yaml
@@ -128,7 +128,7 @@ object:
       condition: 
       on_entry: update_provision_status(status => 'Provision System')
       on_exit: update_provision_status(status => 'Provision System')
-      on_error: update_provision_status(status => '${/#ae_reason}')
+      on_error: update_provision_status(status => 'Error Provisioning System')
       max_retries: '100'
       max_time: 
   - field:
@@ -148,7 +148,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_provision_status(status => 'Provision System')
-      on_error: update_provision_status(status => '${/#ae_reason}')
+      on_error: update_provision_status(status => 'Error Provisioning System')
       max_retries: '100'
       max_time: 
   - field:

diff --git a/...anageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__class__.yaml b/...anageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__class__.yaml
@@ -188,7 +188,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_provision_status(status => 'Provisioning Host')
-      on_error: update_provision_status(status => '${/#ae_reason}')
+      on_error: update_provision_status(status => 'Error Provisioning Host')
       max_retries: '100'
       max_time: 
   - field:

diff --git a/.../automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml b/.../automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml
@@ -128,7 +128,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_migration_status(status => 'Migrating VM')
-      on_error: update_migration_status(status => '${/#ae_reason}')
+      on_error: update_migration_status(status => 'Error Migrating VM')
       max_retries: '100'
       max_time: 
   - field:

diff --git a/...IQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml b/...IQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml
@@ -128,7 +128,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_provision_status(status => 'Creating Template')
-      on_error: update_provision_status(status => '${/#ae_reason}')
+      on_error: update_provision_status(status => 'Error Creating Template')
       max_retries: '100'
       max_time: 
   - field:
@@ -196,7 +196,7 @@ object:
       name: Finished
       display_name: 
       datatype: string
-      priority: 16
+      priority: 10
       owner: 
       default_value: "/System/CommonMethods/StateMachineMethods/vm_provision_finished"
       substitute: true

diff --git a/...ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml b/...ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml
@@ -208,7 +208,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_provision_status(status => 'Creating VM')
-      on_error: update_provision_status(status => '${/#ae_reason}')
+      on_error: update_provision_status(status => 'Error Creating VM')
       max_retries: '100'
       max_time: 
   - field:
@@ -296,7 +296,7 @@ object:
       name: Finished
       display_name: 
       datatype: string
-      priority: 16
+      priority: 15
       owner: 
       default_value: "/System/CommonMethods/StateMachineMethods/vm_provision_finished"
       substitute: true

diff --git a/...ent/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/provision.yaml b/...ent/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/provision.yaml
@@ -22,7 +22,7 @@ object:
       value: METHOD::execute
       on_entry: update_status(status => 'Starting execute')
       on_exit: update_status(status => 'Ending execute')
-      on_error: update_status(status => '${/#ae_reason}')
+      on_error: update_status(status => 'Error Processing execute')
   - check_completed:
       value: METHOD::check_completed
       on_exit: update_status(status => 'Processed check_completed')
@@ -31,7 +31,7 @@ object:
       value: METHOD::refresh
       on_entry: update_status(status => 'Processing refresh')
       on_exit: update_status(status => 'Processed refresh')
-      on_error: update_status(status => '${/#ae_reason}')
+      on_error: update_status(status => 'Error Processing refresh')
   - check_refreshed:
       value: METHOD::check_refreshed
       on_exit: update_status(status => 'Processed check_refreshed')

diff --git a/...Q/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_none.yaml b/...Q/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_none.yaml
@@ -22,7 +22,7 @@ object:
       value: METHOD::execute
       on_entry: update_status(status => 'Starting execute')
       on_exit: update_status(status => 'Ending execute')
-      on_error: update_status(status => '${/#ae_reason}')
+      on_error: update_status(status => 'Error Processing execute')
   - check_completed:
       value: METHOD::check_completed
       on_exit: update_status(status => 'Processed check_completed')

diff --git a/...Q/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_post.yaml b/...Q/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_post.yaml
@@ -22,7 +22,7 @@ object:
       value: METHOD::execute
       on_entry: update_status(status => 'Starting execute')
       on_exit: update_status(status => 'Ending execute')
-      on_error: update_status(status => '${/#ae_reason}')
+      on_error: update_status(status => 'Error Processing execute')
   - check_completed:
       value: METHOD::check_completed
       on_exit: update_status(status => 'Processed check_completed')

diff --git a/...IQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_pre.yaml b/...IQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_pre.yaml
@@ -32,7 +32,7 @@ object:
       value: METHOD::execute
       on_entry: update_status(status => 'Starting execute')
       on_exit: update_status(status => 'Ending execute')
-      on_error: update_status(status => '${/#ae_reason}')
+      on_error: update_status(status => 'Error Processing execute')
   - check_completed:
       value: METHOD::check_completed
       on_exit: update_status(status => 'Processed check_completed')

diff --git a/...anageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__class__.yaml b/...anageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__class__.yaml
@@ -188,7 +188,7 @@ object:
       condition: 
       on_entry: 
       on_exit: update_serviceprovision_status(status => 'Creating Service')
-      on_error: update_serviceprovision_status(status => '${/#ae_reason}')
+      on_error: update_serviceprovision_status(status => 'Error Creating Service')
       max_retries: '100'
       max_time: 
   - field: