openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[train/stein] Increase resource bundle timeout during update." into stable/stein

This commit is contained in:
Zuul 2020-02-12 18:53:15 +00:00 committed by Gerrit Code Review
parent e8d997b1fc 018ff60cfd
commit 6bec75ca06
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
puppet/services/pacemaker.yaml
View File

@ -334,6 +334,17 @@ outputs:
echo "Could not retrieve and clear location constraint for VIP $v" 2>&1 echo "Could not retrieve and clear location constraint for VIP $v" 2>&1
fi fi
done done
- name: Set the cluster bundle timeout
when: step|int == 1
vars:
pacemaker_bundle_operation_timeout: {get_param: PacemakerBundleOperationTimeout}
container_cli: {get_param: ContainerCli}
block:
- name: Change the bundle operation timeout
command: "pcs resource op defaults timeout={{ pacemaker_bundle_operation_timeout|ternary(pacemaker_bundle_operation_timeout,'120s') }}"
when:
- "container_cli == 'podman'"
- name: Stop pacemaker cluster - name: Stop pacemaker cluster
when: step|int == 1 when: step|int == 1
pacemaker_cluster: state=offline pacemaker_cluster: state=offline