From 1a5c4573c728855baaf84ab661e9adb502d5d3f8 Mon Sep 17 00:00:00 2001 From: william fitzgerald Date: Thu, 20 Apr 2017 15:28:41 -0400 Subject: [PATCH 1/2] Changed ${/#ae_reason} to a string value in on_error methods. Changed all occurrences in class schemas and instances. https://bugzilla.redhat.com/show_bug.cgi?id=1439845 --- .../Provisioning/StateMachines/Provision.class/__class__.yaml | 4 ++-- .../Provisioning/StateMachines/Provision.class/__class__.yaml | 4 ++-- .../StateMachines/Reconfigure.class/__class__.yaml | 4 ++-- .../StateMachines/VMProvision_VM.class/__class__.yaml | 4 ++-- .../Provisioning/StateMachines/Provision.class/__class__.yaml | 4 ++-- .../Provisioning/StateMachines/Provision.class/__class__.yaml | 4 ++-- .../StateMachines/HostProvision.class/__class__.yaml | 2 +- .../VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml | 2 +- .../StateMachines/VMProvision_Template.class/__class__.yaml | 4 ++-- .../StateMachines/VMProvision_VM.class/__class__.yaml | 4 ++-- .../StateMachines/GenericLifecycle.class/provision.yaml | 4 ++-- .../GenericLifecycle.class/retire_advanced_resource_none.yaml | 2 +- .../GenericLifecycle.class/retire_advanced_resource_post.yaml | 2 +- .../GenericLifecycle.class/retire_advanced_resource_pre.yaml | 2 +- .../ServiceProvision_Template.class/__class__.yaml | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/content/automate/ManageIQ/AutomationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml b/content/automate/ManageIQ/AutomationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml index 54555c505..5f4c28cf9 100644 --- a/content/automate/ManageIQ/AutomationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml +++ b/content/automate/ManageIQ/AutomationManagement/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/content/automate/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml b/content/automate/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml index f798a22fb..71ac47087 100644 --- a/content/automate/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml +++ b/content/automate/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 Provisioning 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 Provisioning Stack') max_retries: '100' max_time: - field: 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 2c07bcdcb..ac40ae0d3 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 @@ -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/content/automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml b/content/automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml index b354176c4..9883113f3 100644 --- a/content/automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml +++ b/content/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 Provisioning Instance') 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/content/automate/ManageIQ/ConfigurationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml b/content/automate/ManageIQ/ConfigurationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml index d3ad8e938..4ab981536 100644 --- a/content/automate/ManageIQ/ConfigurationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__class__.yaml +++ b/content/automate/ManageIQ/ConfigurationManagement/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/content/automate/ManageIQ/Infrastructure/Configured_System/Provisioning/StateMachines/Provision.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/Configured_System/Provisioning/StateMachines/Provision.class/__class__.yaml index edcbe4193..71d953e52 100644 --- a/content/automate/ManageIQ/Infrastructure/Configured_System/Provisioning/StateMachines/Provision.class/__class__.yaml +++ b/content/automate/ManageIQ/Infrastructure/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/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__class__.yaml index 8fa768dc7..0beeb009e 100644 --- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__class__.yaml +++ b/content/automate/ManageIQ/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/content/automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/VM/Migrate/StateMachines/VMMigrate.class/__class__.yaml index 622c5a608..2222e4919 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 @@ -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/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml index 0c300ddd2..0cdbbc12b 100644 --- a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml +++ b/content/automate/ManageIQ/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/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml index 837416b75..5f655e0c6 100644 --- a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml +++ b/content/automate/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/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/provision.yaml b/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/provision.yaml index 6f72e28f5..07aaa963a 100644 --- a/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/provision.yaml +++ b/content/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/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_none.yaml b/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_none.yaml index e5c114e92..98dcd9119 100644 --- a/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_none.yaml +++ b/content/automate/ManageIQ/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/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_post.yaml b/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_post.yaml index 3f3252141..efe57e57d 100644 --- a/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_post.yaml +++ b/content/automate/ManageIQ/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/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_pre.yaml b/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_pre.yaml index 1192d9342..4ad79d3da 100644 --- a/content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/retire_advanced_resource_pre.yaml +++ b/content/automate/ManageIQ/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/content/automate/ManageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__class__.yaml b/content/automate/ManageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__class__.yaml index 40b7dcadd..35ae61565 100644 --- a/content/automate/ManageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__class__.yaml +++ b/content/automate/ManageIQ/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: From 595a237e1e5ef27611096580fe29322f32fe2e8f Mon Sep 17 00:00:00 2001 From: william fitzgerald Date: Thu, 20 Apr 2017 16:57:00 -0400 Subject: [PATCH 2/2] changed three status messages. --- .../Provisioning/StateMachines/Provision.class/__class__.yaml | 4 ++-- .../StateMachines/VMProvision_VM.class/__class__.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/automate/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml b/content/automate/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml index 71ac47087..36d8ed221 100644 --- a/content/automate/ManageIQ/Cloud/Orchestration/Provisioning/StateMachines/Provision.class/__class__.yaml +++ b/content/automate/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 => 'Error Provisioning Stack') + 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 => 'Error Provisioning Stack') + on_error: update_serviceprovision_status(status => 'Error Creating Stack') max_retries: '100' max_time: - field: diff --git a/content/automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml b/content/automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml index 9883113f3..e5b74064a 100644 --- a/content/automate/ManageIQ/Cloud/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml +++ b/content/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 => 'Error Provisioning Instance') + on_error: update_provision_status(status => 'Error Creating VM') max_retries: '100' max_time: - field: