openstack/heat
Code Issues Proposed changes

Merge "change contrib/ to use UpdateAllowed property schema"

Browse Source
This commit is contained in:
Jenkins 2013-10-25 12:07:46 +00:00 committed by Gerrit Code Review
commit 9e92fa8b36
2 changed files with 3 additions and 3 deletions
contrib/rackspace/heat/engine/plugins
cloud_loadbalancer.pycloud_server.py

2
contrib/rackspace/heat/engine/plugins/cloud_loadbalancer.py

@ -152,6 +152,7 @@ class CloudLoadBalancer(rackspace_resource.RackspaceResource):
properties_schema = {
'name': {'Type': 'String', 'Required': False},
'nodes': {'Type': 'List', 'Required': True,
'UpdateAllowed': True,
'Schema': {'Type': 'Map', 'Schema': nodes_schema}},
'protocol': {'Type': 'String', 'Required': True,
'AllowedValues': protocol_values},
@ -185,7 +186,6 @@ class CloudLoadBalancer(rackspace_resource.RackspaceResource):
'instance.')}
update_allowed_keys = ('Properties',)
update_allowed_properties = ('nodes',)
def __init__(self, name, json_snippet, stack):
super(CloudLoadBalancer, self).__init__(name, json_snippet, stack)

4
contrib/rackspace/heat/engine/plugins/cloud_server.py

@ -32,7 +32,8 @@ logger = logging.getLogger(__name__)
class CloudServer(instance.Instance):
"""Resource for Rackspace Cloud Servers."""
properties_schema = {'flavor': {'Type': 'String', 'Required': True},
properties_schema = {'flavor': {'Type': 'String', 'Required': True,
'UpdateAllowed': True},
'image': {'Type': 'String', 'Required': True},
'user_data': {'Type': 'String'},
'key_name': {'Type': 'String'},
@ -151,7 +152,6 @@ zypper --non-interactive in cloud-init python-boto python-pip gcc python-devel
# Template keys supported for handle_update. Properties not
# listed here trigger an UpdateReplace
update_allowed_keys = ('Metadata', 'Properties')
update_allowed_properties = ('flavor')
def __init__(self, name, json_snippet, stack):
super(CloudServer, self).__init__(name, json_snippet, stack)