oslo.db release breaks sample config

[Steven Hardy]

oslo.db just released a new version, it's broken our sample conf:

2014-11-17 17:45:21.800 | --- /tmp/heat.XJCXuh/heat.conf.sample 2014-11-17 17:45:21.779176070 +0000
2014-11-17 17:45:21.800 | +++ etc/heat/heat.conf.sample 2014-11-17 17:42:29.547971000 +0000
2014-11-17 17:45:21.800 | @@ -892,9 +892,8 @@
2014-11-17 17:45:21.800 | # Deprecated group/name - [DATABASE]/sql_max_pool_size
2014-11-17 17:45:21.800 | #max_pool_size=<None>
2014-11-17 17:45:21.800 |
2014-11-17 17:45:21.801 | -# Maximum number of database connection retries during
2014-11-17 17:45:21.801 | -# startup. Set to -1 to specify an infinite retry count.
2014-11-17 17:45:21.801 | -# (integer value)
2014-11-17 17:45:21.801 | +# Maximum db connection retries during startup. Set to -1 to
2014-11-17 17:45:21.801 | +# specify an infinite retry count. (integer value)
2014-11-17 17:45:21.801 | # Deprecated group/name - [DEFAULT]/sql_max_retries
2014-11-17 17:45:21.801 | # Deprecated group/name - [DATABASE]/sql_max_retries
2014-11-17 17:45:21.801 | #max_retries=10
2014-11-17 17:45:21.801 | check_uptodate.sh: heat.conf.sample is not up to date.
2014-11-17 17:45:21.801 | check_uptodate.sh: Please run /home/jenkins/workspace/gate-heat-pep8/tools/config/generate_sample.sh.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/135081
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=c0f8529dabbf064bb582d5b10e032070f90ccc89
Submitter: Jenkins
Branch: master

commit c0f8529dabbf064bb582d5b10e032070f90ccc89
Author: Steven Hardy <email address hidden>
Date: Mon Nov 17 21:00:12 2014 +0000

    Update sample conf for new oslo.db release

    oslo.db just released a new version, and it's broken our gate config
    check, so update it.

    Change-Id: I0d077d0f55fbc2ab9faac5ff9deaadba00452869
    Closes-Bug: #1393559

[Matt Riedemann (mriedem)]

Looks like cinder/solum/sahara also hit this:

http://logstash.openstack.org/#eyJzZWFyY2giOiJtZXNzYWdlOlwiKyMgTWF4aW11bSBkYiBjb25uZWN0aW9uIHJldHJpZXMgZHVyaW5nIHN0YXJ0dXAuIFNldCB0byAtMSB0b1wiIEFORCB0YWdzOlwiY29uc29sZVwiIiwiZmllbGRzIjpbXSwib2Zmc2V0IjowLCJ0aW1lZnJhbWUiOiI2MDQ4MDAiLCJncmFwaG1vZGUiOiJjb3VudCIsInRpbWUiOnsidXNlcl9pbnRlcnZhbCI6MH0sInN0YW1wIjoxNDE2MzI2Mzk2MzE2LCJtb2RlIjoiIiwiYW5hbHl6ZV9maWVsZCI6IiJ9

[Steven Hardy (shardy)]

Given that we're moving to a model where we no longer control the timing of oslo updates, it probably makes sense for us (and other projects) to stop including a statically generated config in the tree, e.g include a README instead like nova already does.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/135363

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/135363
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=699cc6251501638759177fe83b4090faeb88e0e5
Submitter: Jenkins
Branch: stable/juno

commit 699cc6251501638759177fe83b4090faeb88e0e5
Author: Steven Hardy <email address hidden>
Date: Mon Nov 17 21:00:12 2014 +0000

    Update sample conf for new oslo.db release

    oslo.db just released a new version, and it's broken our gate config
    check, so update it.

    Change-Id: I0d077d0f55fbc2ab9faac5ff9deaadba00452869
    Closes-Bug: #1393559
    (cherry picked from commit c0f8529dabbf064bb582d5b10e032070f90ccc89)