Commit Graph

13036 Commits

Author SHA1 Message Date
OpenDev Sysadmins 12b9b24c25 OpenDev Migration Patch
This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.
2019-04-19 19:44:34 +00:00
David Rabel 746253136f Bump build dependency on openstack-pkg-tools
New version does not require net-tools.

See Debian bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858698

Change-Id: Ibb3b4e72a3e6480e6d112a9bd786f6e46b37b007
2017-04-01 12:26:11 +02:00
David Rabel 24ce2e0646 Add missing dependency net-tools
See Debian bug:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858698

Change-Id: I5991678603f519c47d65ebb86d0d16de89f2b00c
2017-03-25 12:17:31 +01:00
Thomas Goirand 7b41032e33 Add allow-sqlalchemy-1.1.patch
* Add allow-sqlalchemy-1.1.patch.

Change-Id: I5ee463052b7fffb0141fb7902d9690bda2aba8c0
2017-01-11 03:03:10 +01:00
Thomas Goirand 9da81d0d71 Remove broken rst with latest docutils
* Remove broken rst with latest docutils (Closes: #850231).

Change-Id: Ibe6fa8f8248dc6d7fcc62786b961488b43dbc429
2017-01-08 13:37:00 +01:00
Thomas Goirand 3ab0b42ffb CVE-2016-9185 fix
* CVE-2016-9185_Prevent_template_validate_from_scanning_ports.patch

Change-Id: I2f44ea70de2ae19a91fbc4331aa0d9da1785a9ac
2016-12-26 17:38:55 +01:00
Ondřej Nový fed9f0adf5 Bumped debhelper compat version to 10
Change-Id: Ic070781d35d6688c1634dae291022f9c93da1f76
2016-11-23 23:59:00 +01:00
Thomas Goirand d485a1430c unstabe -> unstable
Change-Id: I347a5307ed8bf82f078cdd77cffe7a512e086d87
2016-10-07 03:47:47 +02:00
Thomas Goirand 609540fc98 heat 7.0.0 release
meta:version: 7.0.0
 meta:diff-start: 6.0.0.0rc1
 meta:series: newton
 meta:release-type: release
 meta:announce: openstack-announce@lists.openstack.org
 meta:pypi: no
 meta:first: yes
 meta:release:Author: Doug Hellmann <doug@doughellmann.com>
 meta:release:Commit: Doug Hellmann <doug@doughellmann.com>
 meta:release:Change-Id: I74b66ffd484f2f3a2b84c39e62bcb718cef7b906
 meta:release:Code-Review+1: Ian Cordasco <sigmavirus24@gmail.com>
 meta:release:Code-Review+1: Sean McGinnis <sean.mcginnis@gmail.com>
 meta:release:Code-Review+1: Vitaly Gridnev <vgridnev@mirantis.com>
 meta:release:Code-Review+1: Rob Cresswell <robert.cresswell@outlook.com>
 meta:release:Code-Review+1: Steve Martinelli <s.martinelli@gmail.com>
 meta:release:Code-Review+1: Steve McLellan <steven.j.mclellan@gmail.com>
 meta:release:Code-Review+1: Richard Jones <r1chardj0n3s@gmail.com>
 meta:release:Code-Review+2: Davanum Srinivas (dims) <davanum@gmail.com>
 meta:release:Code-Review+2: Thierry Carrez <thierry@openstack.org>
 meta:release:Code-Review+1: Emilien Macchi <emilien@redhat.com>
 meta:release:Code-Review+1: Julien Danjou <julien@danjou.info>
 meta:release:Code-Review+1: amrith <amrith@tesora.com>
 meta:release:Code-Review+1: Graham Hayes <graham.hayes@hpe.com>
 meta:release:Code-Review+1: Jim Rollenhagen <jim@jimrollenhagen.com>
 meta:release:Code-Review+2: Doug Hellmann <doug@doughellmann.com>
 meta:release:Workflow+1: Doug Hellmann <doug@doughellmann.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJX9k2sAAoJENljH+rwzGInpGgIALJNiyDYegj+C99xU6m/3vKH
 LKFZ6e3SF+n2x55DcAnEkrx55HZTvluBHmoH0G38msxtRaTnuSPs/N+HsjVxQGYS
 Js2GbB3H9okn1ABO7aTwDcjqVR80w1Dy7CCMtw80kCj0LTrIR2OoBTcq2n1JSQEY
 vdbMPh2ikSr6joVXIKFLTScyjcYRadXYFVAIxfxduIL2XRYicYZFbbI6yeSj3HcX
 Gnw4GQHzSW2AmYwGG9swzWJtALLQqZPkNDUXizis76190ieSx0LdwfHFjU+Ba1Rc
 lif8FYCLxEZXC0klD8/vUn4uqqyNiqeAnO37UyH4aGsbTSdFDuEztVCBsf8j3HU=
 =RUxe
 -----END PGP SIGNATURE-----

Merge tag '7.0.0' into debian/newton

heat 7.0.0 release

  * New upstream release.

Change-Id: I7fe0fafa47667b52edd31d6987354c03b85cc097
2016-10-07 03:05:31 +02:00
Thomas Goirand a7672011fd Debconf translation + unstable upload
* Uploading to unstable.
  * Debconf translation:
    - it (Closes: #839195).

Change-Id: I91ebf677358a3652c3e675126d429e66c83d58a0
2016-10-04 09:39:14 +02:00
Thomas Goirand 958a8ffa97 Fixed config gneration namespaces.
Change-Id: Ia3daa9f0e8c7da38caf4be04126e4a8f6763992d
2016-10-02 11:32:44 +02:00
Thomas Goirand d8a823e17d Build-Depends on openstack-pkg-tools >= 53~.
Change-Id: I76e73615e0cae198e1a1a49a14cc7c46ef1034ca
2016-10-01 09:31:53 +02:00
Thomas Goirand 9f96befc70 Fixed oslotest EPOCH.
Change-Id: Iddabc2ffb6f6eccc393084131d74e49ef5bcd0cd
2016-09-28 09:42:33 +02:00
Jenkins dd707bc997 Merge "Increase the timeout for the stop_stack message" into stable/newton 2016-09-26 19:35:45 +00:00
Ondřej Nový b3852be821 Mass changes
d/s/options: extend-diff-ignore of .gitreview
d/control: Use correct branch in Vcs-* fields

Change-Id: I0e6f1e9093cb5a62a598405a41ac67add65a8752
2016-09-26 19:02:45 +02:00
Zane Bitter e59f927562 Get rid of circular reference in Event class
This would have been causing the entire stack to remain in memory until
garbage-collected. We only need the identifier, so store that instead.

Change-Id: If965b4415d7640b93edd153f2893a7e0c04bc8d6
Partial-Bug: #1626675
(cherry picked from commit 82b8fd8c17)
2016-09-23 09:38:02 -04:00
Zane Bitter ee86435e44 Increase the timeout for the stop_stack message
Previously, the stop_stack message accidentally used the
engine_life_check_timeout (by default, 2s). But unlike other messages sent
using that timeout, stop_stack needs to synchronously kill all running
threads operating on the stack. For a very large stack, this can easily
take much longer than a couple of seconds. This patch increases the timeout
to give a better chance of being able to start the delete.

Change-Id: I4b36ed7f1025b6439aeab63d71041bb2000363a0
Closes-Bug: #1499669
(cherry picked from commit e56fc689e1)
2016-09-23 09:20:18 -04:00
Jenkins e4c4c56464 Merge "Don't use cast() to do StackResource delete" into stable/newton 2016-09-23 05:32:54 +00:00
Thomas Goirand d662b37bbd Add python-aodhclient (>= 0.5.0) b-d
* Add python-aodhclient (>= 0.5.0) b-d
  * Fails the build on unit test failures.

Change-Id: Id2ddc6f5e449e792ddfabaf8cd92809caaaea2b4
2016-09-23 00:40:06 +02:00
Crag Wolfe fb26ec9da5 Do not attempt deletion of a DELETE_COMPLETE stack in service api
A stack may be in transient state where it is DELETE_COMPLETE, but has
has not actually been soft-deleted yet. For the purposes of
delete_stack in service.py, consider a DELETE_COMPLETE stack as
equivalent to a soft-deleted one (it soon will be), thereby avoiding a
race where we would have attempted to update the stack, running into a
foreign-key constraint issue for a non-existing user_cred.

Change-Id: Iec021e6a0df262d447fdf9ee1789603c7a1c55f8
Closes-Bug: #1626173
Closes-Bug: #1626107
(cherry picked from commit e1f161a19a)
2016-09-22 15:25:22 +00:00
Zane Bitter a96d89b200 Don't use cast() to do StackResource delete
If an exception was raised in delete_stack when deleting a nested stack,
the parent stack would never hear about it because we were accidentally
using cast() instead of call() to do the stack delete. This meant the
parent resource would remain DELETE_IN_PROGRESS until timeout when the
nested stack had already failed and raised an exception.

In the case of bug 1499669, the exception being missed was
StopActionFailed.

Change-Id: I039eb8f6c6a262653c1e9edc8173e5680d81e31b
Partial-Bug: #1499669
(cherry picked from commit e5cec71e52)
2016-09-22 10:05:59 -04:00
Thomas Goirand fca288b163 tag 7.0.0.0rc1
Tagger: OpenStack Release Bot <infra-root@openstack.org>
 Date:   Thu Sep 15 14:25:49 2016 +0000
 
 retag 7.0.0_rc1 of heat 7.0.0.0rc1 release candidate
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJX44xwAAoJENQWrRWsa0P+n10P/2zlxI78uWFONjzK2lWK5LDE
 +cEV9pzoSFNFRb6+SHwZFRzgN9iB9XuROdi2R3gMzLfHwBuF3cYjsCgeyyXqBRWO
 oSDpzaFVWdmWtnc88w/Ed8mJS0nysztaGlD6AgQU1Z3QEdSE8sEz70QQUgHWhARy
 X2JjGSVe/ZABSRvSn7z/CQzQEx1eClID/EuUnajCotGjXz4eOV+epCofFbnjpKpQ
 7cHCky2Nt/28YmIC3V/giRHsAaAwRBU4A2vur+r+UWbHEph3AcvYE9DtWaFQFq9f
 +0I1PqoXtYNS/aKu/wyFvwKPXyAmzi0vGVAz2oZ4XyW3mrFssmPhPCsm47Sh+h3i
 PgKf6Cvryr3o28ANiXcVYX88fbyCcUc0lbeBrs7PjOUR9wKrDFBenlwnHrViCSXL
 FB4hc583cZqFt3yfme5YzH5Y+vB5G/6Gs6zq/pq7R5/hrpW96lFh01/jBEtTF2vc
 3P2q9lS3QPrE8RRmsSbJAMa4DjXY7SZTmSrlsLtVmScnAVQIo7RsHahlOtm3u6FC
 4Fw3fLz+b6dJWxZOUrb9DRcEwAK66VyMqpvCU0UMJNLwmEcykRVhavm4pe1ryklk
 3e1K7Fqjbj/e4saedAz1dt6v0j0xsJHKKqMpdnqv5YF4TtoANITAbftqG1HbbdVD
 9QNH+RW4K72w/n2IjAi5
 =DF1J
 -----END PGP SIGNATURE-----

Merge tag '7.0.0_rc1' into debian/newton

tag 7.0.0.0rc1
Tagger: OpenStack Release Bot <infra-root@openstack.org>
Date:   Thu Sep 15 14:25:49 2016 +0000

retag 7.0.0_rc1 of heat 7.0.0.0rc1 release candidate

  * New upstream release.
  * Using OpenStack's Gerrit as VCS URLs.

Change-Id: I35a99832fe33a478bc40b144f6801658869b2a46
2016-09-22 09:48:14 +02:00
Jenkins 55a4aad7f9 Merge "Fix cancel update for nova server with defined port" into stable/newton 2016-09-21 23:02:34 +00:00
Jenkins 298250fa45 Merge "Re-trigger on update-replace" into stable/newton 2016-09-21 12:07:42 +00:00
Jenkins 38a4afa998 Merge "Legacy delete attempt thread cancel before stop" into stable/newton 2016-09-21 08:57:34 +00:00
Thomas Goirand d36828ae47 Using --parallel for unit tests
Change-Id: I9ec502102be84b24c6bc4ec794160653086b2481
2016-09-21 09:52:35 +02:00
Oleksii Chuprykov 9ece778613 Fix cancel update for nova server with defined port
This particular patch fixes a behaviour of cancel update for
nova server with defined port, so there are no ports manageable
by nova. We have these issues while restoring ports after rollback:
1) We doesn't detach any ports from current server, because we
doesn't save them to resoruce data. (we store this data after
succesfull create of the server)
2) Detaching an interface from current server will fail, if the server
will be in building state, so we need to wait until server will be
in active or in error state.
Refresh ports list to solve problem (1).
Wait until nova moves to active/error state to solve (2).
A functional test to prove the fix was added. Note, that this test is
skipped for convergence engine tests until cancel update will work
properly in convergence mode (see bug 1533176).

Partial-Bug: #1570908
Change-Id: If6fd916068a425eea6dc795192f286cb5ffcb794
(cherry picked from commit 584efe3329)
2016-09-21 08:50:56 +05:30
Anant Patil c6bc3fef71 Re-trigger on update-replace
It is found that the inter-leaving of lock when a update-replace of a
resource is needed is the reason for new traversal not being triggered.

Consider the order of events below:
1. A server is being updated. The worker locks the server resource.
2. A rollback is triggered because some one cancelled the stack.
3. As part of rollback, new update using old template is started.
4. The new update tries to take the lock but it has been already
acquired in (1). The new update now expects that the when the old
resource is done, it will re-trigger the new traversal.
5. The old update decides to create a new resource for replacement. The
replacement resource is initiated for creation, a check_resource RPC
call is made for new resource.
6. A worker, possibly in another engine, receives the call and then it
bails out when it finds that there is a new traversal initiated (from
2). Now, there is no progress from here because it is expected (from 4)
that there will be a re-trigger when the old resource is done.

This change takes care of re-triggering the new traversal from worker
when it finds that there is a new traversal and an update-replace. Note
that this issue will not be seen when there is no update-replace
because the old resource will finish (either fail or complete) and in
the same thread it will find the new traversal and trigger it.

Closes-Bug: #1625073
Change-Id: Icea5ba498ef8ca45cd85a9721937da2f4ac304e0
(cherry picked from commit 99b055b423)
2016-09-21 08:43:01 +05:30
Jenkins 847fca33f0 Merge "Updated from global requirements" into stable/newton 2016-09-21 03:02:35 +00:00
Jenkins 71a8d63479 Merge "Cancel traversal of nested stack" into stable/newton 2016-09-20 21:11:25 +00:00
Jenkins 71854e6fda Merge "Don't acquire the lock when cancelling a stack" into stable/newton 2016-09-20 21:10:27 +00:00
Steve Baker 2dd44db1b9 Legacy delete attempt thread cancel before stop
The error messages 'Command Out of Sync' are due to the threads being
stopped in the middle of the database operations. This happens in the
legacy action when delete is requested during a stack create.

We have the thread cancel message but that was not being used in this
case. Thread cancel should provide a more graceful way of ensuring the
stack is in a FAILED state before the delete is attempted.

This changes does the following in the delete_stack service method for
legace engine:
- if the stack is still locked, send thread cancel message
- in a subthread wait for the lock to be released, or until a
  timeout based on the 4 minute cancel grace period
- if the stack is still locked, do a thread stop as before

Closes-Bug: #1499669
Closes-Bug: #1546431
Closes-Bug: #1536451
Change-Id: I4cd613681f07d295955c4d8a06505d72d83728a0
(cherry picked from commit 3000f90408)
2016-09-21 08:12:01 +12:00
Jenkins 0050564bf4 Merge "Use correct schema for SoftwareDeploymentGroup rolling_update" into stable/newton 2016-09-20 17:02:29 +00:00
Jenkins 0c2065b810 Merge "Fix sync point delete" into stable/newton 2016-09-20 15:17:33 +00:00
OpenStack Proposal Bot 9ea43edfad Updated from global requirements
Change-Id: I0ebaeff953abe61f8d08b03ab93d11005ea1821a
2016-09-20 13:11:06 +00:00
Jenkins 4fc7af141e Merge "Correct the response info of template-version-list" into stable/newton 2016-09-20 12:56:47 +00:00
Anant Patil 25fbedc726 Cancel traversal of nested stack
The stack cancel update would halt the parent stack from propagating but
the nested stacks kept on going till they either failed or completed.
This is not desired, the cancel update should stop all the nested stacks
from moving further, albeit, it shouldn't abruptly stop the currently
running workers.

Change-Id: I3e1c58bbe4f92e2d2bfea539f3d0e861a3a7cef1
Co-Authored-By: Zane Bitter <zbitter@redhat.com>
Closes-Bug: #1623201
(cherry picked from commit bc2e136fe3)
2016-09-20 08:54:01 -04:00
Jenkins 663d6e6f21 Merge "Allow update inplace for allowed_address_pairs" into stable/newton 2016-09-20 08:46:34 +00:00
huangtianhua d26c90389a Correct the response info of template-version-list
Correct HeatTemplateFormatVersion.2012-12-12 as cfn template.
Closes-Bug: #1623340

Change-Id: I5dd0131c60ab5786ad667e4e61c3eeeb7fae047d
(cherry picked from commit bf5ce6af12)
2016-09-19 15:41:50 -04:00
Anant Patil c7fe0ba5ee Fix sync point delete
When a resource failed, the stack state was set to FAILED and current
traversal was set to emoty string. The actual traversal was lost and
there was no way to delete the sync points belonging to the actual
traversal.

This change keeps the current traversal when you do a state set, so that
later you can delete the sync points belonging to it. Also, the current
traversal is set to empty when the stack has failed and there is no need
to rollback.

Closes-Bug: #1618155

Change-Id: Iec3922af92b70b0628fb94b7b2d597247e6d42c4
(cherry picked from commit 2e281df428)
2016-09-19 15:40:04 -04:00
Zane Bitter 14a90d67a6 Use correct schema for SoftwareDeploymentGroup rolling_update
Change-Id: Ie5f1df4862fcbe7fc2949b3516f91e193461b2a0
Closes-Bug: #1624387
(cherry picked from commit 676281dc8c)
2016-09-19 14:39:06 -04:00
Davanum Srinivas 80081db9f8 Update UPPER_CONSTRAINTS_FILE for stable/newton
Change-Id: Iab0150ac0a611de8c8ae0138c76083cacb383068
2016-09-19 15:08:48 +00:00
Zane Bitter 4695f47f68 Don't acquire the lock when cancelling a stack
We used to try to acquire the stack lock in order to find out which engine
to cancel a running update on, in the misguided belief that it could never
succeed. Accordingly, we never released the lock.

Since it is entirely possible to encounter a race where the lock has
already been released, use the get_engine_id() method instead to look up
the ID of the engine holding the lock without attempting to acquire it.

Change-Id: I1d026f8c67dddcf840ccbc2f3f1537693dc266fb
Closes-Bug: #1624538
(cherry picked from commit e2ba3390cd)
2016-09-19 10:52:47 -04:00
Sergey Kraynev 5443453fbb Allow update inplace for allowed_address_pairs
This patch allows to do update inplace for allowed_address_pairs
properties. Scenario mentioned in bug works correct now.

Also add couple fixes to related test:
- Add explicit translation name to string, otherwise it returns objects,
  that raise error during resolving Property name, which should be a
  string.
- Add check, that update of any of mentioned properties does not cause replace.

Change-Id: I913fd36012179f2fdd602f2cca06a89e3fa896f3
Closes-Bug: #1623821
(cherry picked from commit 353e7319db)
2016-09-19 07:14:26 +00:00
Thomas Goirand 9081def827 Tagger: OpenStack Release Bot <infra-root@openstack.org>
Date:   Thu Sep 1 08:56:13 2016 +0000
 
 retag 7.0.0_b3 of heat 7.0.0.0b3 development milestone
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJX3X7IAAoJENQWrRWsa0P+4x4P/1Bu2mnLLj/72pJcf1KCxsGA
 o3W2OyqAnXAr25KQ+g2BYAtvi1vyRGnCFiMR/wt7n6tb4VECASTowpLFC32CW1f4
 TkzhVKr7oWYC+aEJw3EIZUOBkSMOtxR+H+F9eqiGN78B38kpNHuQK9D8npJwBU6n
 jxy2jVF5L363SzEpVD/DDxt8ujVRm5sm6tzEQMnrKTKQesG4TaQkUuFLF/5lJKkd
 Nxa3pnTCMfn8S8z6/hXRGkHmN0XLU9NBCeysobBc+vXWuckf1S3wvvHTsTFNqDr8
 phqDHD/erJGtc8P0Xqe1ScUahv2pw7xK6yplUZ2hM+LOHBscAKemKeeuIrlJUvMG
 HxtKsG0MSux3C5tN/V6Fnj5U2Psl4oqVP8ZU2oXryZQxd8IzvH1XcihSnp1sKlsP
 H5E/t1S8VdqDn+0Q9+jIGxqle5P3kArSgxDWyvBDynJpYMoslWPa3enCqa3OxpIA
 eyoLzef/wtnXi2Hcab+g6hh1gGAPY6RtOUIeh2wkZ1A6clDiOGpi1hjxY7SiUSuI
 s7oEvnPG5JuGitQ1u/pl2f1DYig4CFZ2z4xuBflvhBysZQwEqngBaT0fkAtGUb0a
 mAlEs7RCE6sFKGPUWUp/J6woKEfrhLa7ClQyqDlhuNZZMWeufcs3KnkCPBm3u1AO
 Tgqn+9hMv6udoPqHjJb5
 =Ta4q
 -----END PGP SIGNATURE-----

Merge tag '7.0.0_b3' into debian/newton

Tagger: OpenStack Release Bot <infra-root@openstack.org>
Date:   Thu Sep 1 08:56:13 2016 +0000

retag 7.0.0_b3 of heat 7.0.0.0b3 development milestone

  * New upstream release.
  * Fixed (build-)depends for this release.
  * Rebased fix-requirements.txt.patch.

Change-Id: Ifab6815141aa05ef6ba07eea77f7b665f04b7ad7
2016-09-17 20:07:24 +02:00
Zane Bitter 4a57772a74 Don't log locked resource at ERROR level
It's expected that during a convergence traversal, we may encounter a
resource that is still locked by a previous traversal. Don't log an
ERROR-level message about what is a normal condition. Instead, log at
INFO level describing what is happening, with more details at DEBUG
level.

Change-Id: I645c2a173b828d4a983ba874037d059ee645955f
Related-Bug: #1607814
(cherry picked from commit 7f5bd76f7a)
2016-09-16 13:45:18 -04:00
Davanum Srinivas 8938a26d6b Update .gitreview for stable/newton
Change-Id: I54e0df289a6f999ae1086fd8fef6284d908d95b0
2016-09-15 10:27:12 -04:00
Jenkins 5dc1084260 Merge "Make get_attr consistent across template versions" 2016-09-15 13:26:37 +00:00
Jenkins d899c240e4 Merge "Skip resource counting during validation" 2016-09-15 10:40:50 +00:00
Jenkins 9730600c08 Merge "Avoid circular references in Macro class" 2016-09-15 06:30:06 +00:00