Fix ResourceGroup validate when there are removal_policies
We can't call child_template() from a validate in ResourceGroup
as it accesses nested(). So move the validation to validate_nested_stack()
so we can control the test template used for validation.
Unfortunately coverage for this got removed during recent test rework
and it looks like the interface has got broken.
Persist parent_resource_name and make sure it's available
We are persisting for a number of reasons:
- so we don't have to pass this through ever rpc call
- the API exposes parent_resource (currently always None as
it is not persisted)
Closes-bug: #1438978
Change-Id: Id2db36c0234a085ec4f0ce2ab114ec483ea29d81
(cherry picked from commit edf86aeac2f7b68243b0eccc3c49fa1a579e664b)
commit f944c86d4c26877f4d8dab56790815af8e83ba45
Author: Michal Rostecki <email address hidden>
Date: Wed Mar 25 06:47:33 2015 +0100
Novaclient v2 instead of v1_1
Nova API v1.1 is now deprecated and causes warnings.
Change-Id: Ib4b57a308b7637f4015a07b4e888ccd6347cb947
Closes-Bug: #1437158
(cherry picked from commit d9d68cf52bd7027e7d1cafd023a399c2a342b2c5)
Don't re-bind environment for get_file during stack update
While we're in the process of updating a stack, we set the stack's
environment to the new, updated values. However, we don't want to change
existing resources' idea of their own values until we have explivitly done
an update of them to bring them into line with the new
template/environment. So when parsing a template snippet containing the
get_file intrinsic, store the files dict to which it will refer. get_file
will resolve to the new file only when the template has been updated.
Closes-Bug: #1445170
Change-Id: I8ec32b0e38389cd314e4b2b2d8c65f61f8a9c41e
(cherry picked from commit e4447e7b66cf4691218b067643b5e25de72e31ba)
Cleans nullable=True in db model column declaration
By default sqlalchemy considers the Column's nullable=True and
this patch cleans those column declaration which is having
default value for the nullable field as it is not required
explicitly
Change-Id: I22b0d62238298fa49da09c53019408bc2049b893
Closes-bug: #1439959
(cherry picked from commit 1dbb1ed98f98a8b474f4d54df6554e4e1d93a296)
If a server network using port id, update image property will fail
with error 'port is still in use'. Set IMAGE_UPDATE_POLICY to
REBUILD will preserve the port information when update the image.
Closes-Bug: #1439708
Change-Id: I023ee076682bd5febb960dc8754d61986fd9bedf
(cherry picked from commit 9062453aa5aa0bb197623e80128f4ada63cd5fac)
Manual import of Translations from Transifex. This change also removes
all po files that are less than 66 per cent translated since such
partially translated files will not help users.
This change needs to be done manually since the automatic import does
not handle the proposed branches and we need to sync with latest
translations.
Make SoftwareDeployments work for non-CREATE actions
Currently we only create the deployment if the actions list includes
CREATE, but its valid to create e.g DELETE only deployments, which
curently won't work. So determine whether to create the deployment
on the resource_id instead of via the action, which resolves this problem.
Change-Id: Ia563f4130c31baa4dcee3be3786ea3c49b6bad98
Closes-Bug: #1444087
(cherry picked from commit 0d4235015065a814f7e76f4a34d422146c58ec72)
Reviewed: https:/ /review. openstack. org/179291 /git.openstack. org/cgit/ openstack/ heat/commit/ ?id=5d725ecd09a 35e3d5fb042956c 4ecebb309c0a41
Committed: https:/
Submitter: Jenkins
Branch: master
commit b5c32027e5f207c ca51796ee2aba34 6413ad48da
Author: Steven Hardy <email address hidden>
Date: Thu Apr 23 14:14:26 2015 +1000
Fix ResourceGroup validate when there are removal_policies
We can't call child_template() from a validate in ResourceGroup nested_ stack()
as it accesses nested(). So move the validation to validate_
so we can control the test template used for validation.
Unfortunately coverage for this got removed during recent test rework
and it looks like the interface has got broken.
Co-Authored-by: Angus Salkeld <email address hidden> 36b041cc49a2c48 6fa71e562d9
Change-Id: Ibea738a3438477
Closes-Bug: #1446861
commit c958ecb5b4b4fc5 a0236b70c21d7d6 2864cd162b
Author: Ethan Lynn <email address hidden>
Date: Wed Apr 22 13:46:11 2015 +0800
Fix unicodeerror when heat-engine start
If change local language to other languages(like ja), heat-engine
will failed to start.
Closes-Bug: #1446958 c1c52ea758c1583 191e5a52a2d 42616a16843d03e 6c13cdcb08)
Change-Id: Ia3cbcebb86257b
(cherry picked from commit 0b3dd7be3d3cd98
commit 94c4ae56e0fece9 95659d718ed1ab6 e56b2deb9f
Author: Ethan Lynn <email address hidden>
Date: Tue Apr 21 17:09:42 2015 +0800
Add v6-fixed-ip support for nova server
Now nova server fixed-ip only support ipv4 address,
this patch add IPv6 fixed ip support for nova server.
Closes-Bug: #1446532 f053a043d00ab87 a84ee2470f3 a638ed7ea239221 d13678024c)
Change-Id: I647abeedd36352
(cherry picked from commit 3e1a6f3b826bbc2
commit d07f91615a15966 3261091e672ce62 f90e6ad607
Author: Angus Salkeld <email address hidden>
Date: Tue Apr 7 09:25:50 2015 +1000
Persist parent_ resource_ name and make sure it's available
We are persisting for a number of reasons:
- so we don't have to pass this through ever rpc call
- the API exposes parent_resource (currently always None as
it is not persisted)
Closes-bug: #1438978 5ec4f0ce2ab114e c483ea29d81 243b0eccc3c49fa 1a579e664b)
Change-Id: Id2db36c0234a08
(cherry picked from commit edf86aeac2f7b68
commit f944c86d4c26877 f4d8dab56790815 af8e83ba45
Author: Michal Rostecki <email address hidden>
Date: Wed Mar 25 06:47:33 2015 +0100
Novaclient v2 instead of v1_1
Nova API v1.1 is now deprecated and causes warnings.
Change-Id: Ib4b57a308b7637 f4015a07b4e888c cd6347cb947 e7d1cafd023a399 c2a342b2c5)
Closes-Bug: #1437158
(cherry picked from commit d9d68cf52bd7027
commit 370f3c98c5eccf8 bce1be425acc31a f5e7224171
Author: Zane Bitter <email address hidden>
Date: Thu Apr 16 17:20:05 2015 -0400
Don't re-bind environment for get_file during stack update
While we're in the process of updating a stack, we set the stack's environment. So when parsing a template snippet containing the
environment to the new, updated values. However, we don't want to change
existing resources' idea of their own values until we have explivitly done
an update of them to bring them into line with the new
template/
get_file intrinsic, store the files dict to which it will refer. get_file
will resolve to the new file only when the template has been updated.
Closes-Bug: #1445170 d314e4b2b2d8c65 f61f8a9c41e 1218b067643b5e2 5de72e31ba)
Change-Id: I8ec32b0e38389c
(cherry picked from commit e4447e7b66cf469
commit d61ba3ba5222dd6 338528cbb4232df 6ed959f540
Author: Kanagaraj Manickam <email address hidden>
Date: Mon Apr 6 10:52:57 2015 +0530
Cleans nullable=True in db model column declaration
By default sqlalchemy considers the Column's nullable=True and
this patch cleans those column declaration which is having
default value for the nullable field as it is not required
explicitly
Change-Id: I22b0d62238298f a49da09c5301940 8bc2049b893 474f4d54df6554e 4e1d93a296)
Closes-bug: #1439959
(cherry picked from commit 1dbb1ed98f98a8b
commit 7dbaa72f591d420 e1c979f27be3020 b69815e461
Author: Ethan Lynn <email address hidden>
Date: Thu Apr 2 18:34:37 2015 +0800
Set IMAGE_UPDATE_POLICY default to REBUILD
If a server network using port id, update image property will fail
with error 'port is still in use'. Set IMAGE_UPDATE_POLICY to
REBUILD will preserve the port information when update the image.
Closes-Bug: #1439708 febb960dc8754d6 1986fd9bedf 197623e80128f4a da63cd5fac)
Change-Id: I023ee076682bd5
(cherry picked from commit 9062453aa5aa0bb
commit 49c3c2008b95ac6 3ddc4ec524eda65 6bfe3ce440
Author: huangtianhua <email address hidden>
Date: Thu Apr 2 14:22:35 2015 +0800
To attach interface for server when using 'uuid'
If user using 'uuid' to specify the network id, to make
sure to attach interface for server when updating.
Change-Id: Ie7ceb9c54ab4da 4ad9a5d19803791 edd41e5604c 98955d462551f6d a829045ce0)
Closes-Bug: #1439497
(cherry picked from commit 6523afe8c9739a0
commit 1f977aa5fa28ed1 e351f3371912911 98384abe02
Author: Eric Brown <email address hidden>
Date: Mon Apr 20 15:44:37 2015 -0700
Set auth_encryption_key option to be secret
To avoid exposure in the logs, auth_encryption_key from heat.conf
should be marked secret.
Change-Id: Ia4aca067f03317 dd8073988cd29d2 6c2ccc88778 bc4e4169f23c5cd 5a958ef008)
Closes-Bug: #1446408
(cherry picked from commit 369789f69c34a6c
commit 7c0dc01099c0d14 3c0707130eb4570 f36154915e
Author: OpenStack Proposal Bot <email address hidden>
Date: Mon Apr 20 17:55:07 2015 +0000
Updated from global requirements
Change-Id: I7797401f72e517 f5fac3e43a522ed f8e539c18b8
commit bc9a59c902c6269 f208bede097967b 81c8991a2b
Author: Andreas Jaeger <email address hidden>
Date: Mon Apr 20 11:58:35 2015 +0200
Release Import of Translations from Transifex
Manual import of Translations from Transifex. This change also removes
all po files that are less than 66 per cent translated since such
partially translated files will not help users.
This change needs to be done manually since the automatic import does
not handle the proposed branches and we need to sync with latest
translations.
Change-Id: I72a675c62c8353 8a07366cbef3bfa 84318eb7bb9
commit f82376800f1e6b5 1d4c8f5a4f35034 ecb8199c06
Author: Ethan Lynn <email address hidden>
Date: Mon Apr 13 18:43:53 2015 +0800
Fix sqlalchemy migration script 061 for DB2 backend
DB2 doesn't support alter column type from string to text,
need to add a new column and copy data from old column, and
later remove the old column.
Closes-Bug: #1443252 faf96398a83dad9 ebe61caaa23 d2d6441f7385d6d 2bd00537ea)
Change-Id: I7b3edf6bf7ea0e
(cherry picked from commit 7b25a9d6471a1a2
commit 6e3f367525632d8 acaa95530d236b5 eb886d2ec9
Author: Thierry Carrez <email address hidden>
Date: Fri Apr 17 10:33:47 2015 +0200
update .gitreview for stable/kilo
Change-Id: I93d957bc06375c dcbc0dfe89ea754 20cf58552ce
commit e2b89e2d58ea4aa 31c4f3d666c0fd4 bf3b0f37ff
Author: Steven Hardy <email address hidden>
Date: Tue Apr 14 19:14:23 2015 +0100
Make SoftwareDeployments work for non-CREATE actions
Currently we only create the deployment if the actions list includes
CREATE, but its valid to create e.g DELETE only deployments, which
curently won't work. So determine whether to create the deployment
on the resource_id instead of via the action, which resolves this problem.
Change-Id: Ia563f4130c31ba a4dcee3be3786ea 3c49b6bad98 4f7e76f4a34d422 146c58ec72)
Closes-Bug: #1444087
(cherry picked from commit 0d4235015065a81