File bug-977258_pacemaker-pengine-env-CRM_meta_timeout.patch of Package pacemaker.3577

commit 959d160ea1cdb7de65341090da5ac48d21156290
Author: Gao,Yan <ygao@suse.com>
Date:   Tue May 3 17:53:54 2016 +0200

    Fix: pengine: lf#2560/lf#2588 - Correctly set the environment variable "OCF_RESKEY_CRM_meta_timeout" when "start-delay" is configured
    
    The environment variable "OCF_RESKEY_CRM_meta_timeout" passed to
    resource agents should not include "start-delay".

diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index ec7b380..6d7917c 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -944,7 +944,6 @@ unpack_operation(action_t * action, xmlNode * xml_obj, resource_t * container,
     if (value_i < 0) {
         value_i = 0;
     }
-    value_i += start_delay;
     value_ms = crm_itoa(value_i);
     g_hash_table_replace(action->meta, strdup(field), value_ms);
 }
openSUSE Build Service is sponsored by