openstack/heat
Code Issues Proposed changes

Merge "Deprecate property 'metadata' of OS::Heat::DeployedServer"

Browse Source
This commit is contained in:
Jenkins
2017-06-08 12:02:11 +00:00
committed by Gerrit Code Review
parent 177732776a 08e8e790bd
commit 34a4c03265
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
heat/engine/resources/openstack/heat/deployed_server.py
View File

@@ -60,7 +60,16 @@ class DeployedServer(server_base.BaseServer):
'keys and values must be 255 characters or less. Non-string '
'values will be serialized to JSON (and the serialized '
'string must be 255 characters or less).'),
update_allowed=True
update_allowed=True,
support_status=support.SupportStatus(
status=support.DEPRECATED,
message='This property will be ignored',
version='9.0.0',
previous_status=support.SupportStatus(
status=support.SUPPORTED,
version='8.0.0'
)
)
),
SOFTWARE_CONFIG_TRANSPORT: properties.Schema(
properties.Schema.STRING,

4
heat/engine/resources/openstack/nova/server.py
View File

@@ -1237,6 +1237,10 @@ class Server(server_base.BaseServer, sh.SchedulerHintsMixin,
after_props = json_snippet.properties(self.properties_schema,
self.context)
if self.METADATA in prop_diff:
server = self.client_plugin().get_server(self.resource_id)
self.client_plugin().meta_update(server,
after_props[self.METADATA])
if self.TAGS in prop_diff:
self._update_server_tags(after_props[self.TAGS] or [])

6
heat/engine/resources/server_base.py
View File

@@ -208,12 +208,6 @@ class BaseServer(stack_user.StackUser):
self.metadata_set(new_md)
updaters = []
server = None
if self.METADATA in prop_diff:
server = self.client_plugin().get_server(self.resource_id)
self.client_plugin().meta_update(server,
prop_diff[self.METADATA])
if self.SOFTWARE_CONFIG_TRANSPORT in prop_diff:
self._update_software_config_transport(prop_diff)