openstack
/
murano
Code Issues Proposed changes

Merge "Add availabilityZone property to Instance class"

This commit is contained in:
Jenkins 2015-02-02 11:40:57 +00:00 committed by Gerrit Code Review
parent f18b9d2af4 deaf6e6fd9
commit f2648d0190
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/io.murano/Classes/resources/Instance.yaml
View File

@ -17,7 +17,9 @@ Properties:
keyname:
Contract: $.string()
Default: null
availabilityZone:
Contract: $.string().notNull()
Default: nova
agent:
Contract: $.class(sys:Agent)
Usage: Runtime
@ -105,6 +107,7 @@ Methods:
properties:
flavor: $.flavor
image: $.image
availability_zone: $.availabilityZone
user_data: $userData
user_data_format: $userDataFormat
key_name: $.keyname

1
murano/tests/functional/api/v1/DummyTestApp/UI/ui.yaml
View File

@ -11,6 +11,7 @@ Templates:
name: generateHostname($.serviceConfiguration.unitNamingPattern, 1)
flavor: $.instanceConfiguration.flavor
image: $.instanceConfiguration.osImage
availabilityZone: $.instanceConfiguration.availabilityZone
secondaryController:
?: