Merge pull request ManageIQ#193 from billfitzgerald0120/timetolive_float

Fixed calculation for Ansible playbook service max TTL.
agrare · Oct 5, 2017 · ae2736d · ae2736d
2 parents 5cc73ae + db4c6ef
commit ae2736d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...ageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/check_completed.rb b/...ageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/check_completed.rb
@@ -53,7 +53,7 @@ def retry_interval
                 max_retry_count = @handle.root['ae_state_max_retries']
                 return if ttl.zero? || max_retry_count.zero?
 
-                interval = ttl / max_retry_count
+                interval = ttl / max_retry_count.to_f
                 if interval > MIN_RETRY_INTERVAL
                   @handle.log('info', "Setting retry interval to #{interval} time to live #{ttl} / #{max_retry_count}")
                   @handle.root['ae_retry_interval'] = interval.minutes

diff --git a/.../Service/Generic/StateMachines/GenericLifecycle.class/__methods__/check_completed_spec.rb b/.../Service/Generic/StateMachines/GenericLifecycle.class/__methods__/check_completed_spec.rb
@@ -94,9 +94,9 @@
         Spec::Support::MiqAeMockObject.new('service' => svc_service, 'service_action' => 'Provision', 'ae_state_max_retries' => 100)
       end
 
-      context "600 ttl, 100 retries eq interval 6" do
-        let(:ae_retry_interval) { 6.minutes }
-        let(:ttl) { 600 }
+      context "650 ttl, 100 retries eq interval 6.5" do
+        let(:ae_retry_interval) { 6.5.minutes }
+        let(:ttl) { 650 }
         it_behaves_like "#ttl"
       end
 
@@ -117,9 +117,9 @@
         Spec::Support::MiqAeMockObject.new('service' => svc_service, 'service_action' => 'Retirement', 'ae_state_max_retries' => 100)
       end
 
-      context "600 ttl, 100 retries eq interval 6" do
-        let(:ae_retry_interval) { 6.minutes }
-        let(:ttl) { 600 }
+      context "650 ttl, 100 retries eq interval 6.5" do
+        let(:ae_retry_interval) { 6.5.minutes }
+        let(:ttl) { 650 }
         it_behaves_like "#ttl"
       end