os-refresh-config needs a timeout argument

[Steve Baker]

Currently any misbehaving script can stall os-refresh-config forever, which leads to the halting of os-collect-config polling and all heat deployment resources timing out.

I propose that an os-refresh-config --timeout <seconds> argument be implemented so that os-refresh-timeout can terminate itself when the overall run time exceeds <seconds>

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/337384

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/337385

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/337384
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=072b0670cce6d33cc402185731437df63d1782d6
Submitter: Jenkins
Branch: master

commit 072b0670cce6d33cc402185731437df63d1782d6
Author: Steve Baker <email address hidden>
Date: Tue Jul 5 11:31:39 2016 +1200

    Template param for what command occ runs

    The ConfigCommand parameter overrides the server resource metadata to
    specify what command os-collect-config runs whenever any configuration
    data changes.

    The default is already 'os-refresh-config' so this change has no
    effect but it allows a future change to specify an
    os-refresh-config --timeout argument to fix bug #1595722.

    Change-Id: I8dd35b6724d8c00e5495faca84ee8fee77641b82
    Partial-Bug: #1595722

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/337385
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=301560b35aae7b8861e519c705f131ead53bb7f0
Submitter: Jenkins
Branch: master

commit 301560b35aae7b8861e519c705f131ead53bb7f0
Author: Steve Baker <email address hidden>
Date: Tue Jul 5 11:53:23 2016 +1200

    Set os-refresh-config timeout to 4 hours

    This change uses the new os-refresh-config --timeout argument to set a
    kill timeout for stalled os-refresh-config runs.

    4 hours is a reasonable conservative value since it matches the stack
    timeout - but it can be set shorter in the future based on actual run
    times.

    Change-Id: I433f558515df24736263ec0d50de08ad8f78498f
    Closes-Bug: #1595722
    DependsOn: Ibcbb2090aed126abec8dac49efa53ecbdb2b9b2c

[Steven Hardy (shardy)]

Some of this landed after the commits we used to cut the n2 release (because periodic promotion has been broken by osc-lib for a few days), so I'll shift this to n3 despite it having landed on trunk.

[Steve Baker (steve-stevebaker)]

Also this will have upgrade implications, os-refresh-config on the nodes must be updated before a stack update containing the tht changes

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 5.0.0.0b3 development milestone.