stackforge-attic/murano-conductor
Code Issues Proposed changes

Merge "Use "flavor" service attribute to select OpenStack flavor"

Browse Source
This commit is contained in:
Jenkins 2013-07-19 13:54:04 +00:00 committed by Gerrit Code Review
commit e3a34f0246
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
conductor/workflow.py
View File

@ -95,22 +95,27 @@ class Workflow(object):
return position + suffix.split('.')
@staticmethod
def _select_func(context, path='', source=None, **kwargs):
def _select_func(context, path='', source=None, default=None, **kwargs):
result = None
if path.startswith('##'):
config = context['/config']
return config[path[2:]]
result = config[path[2:]]
elif path.startswith('#'):
return context[path[1:]]
if source is not None:
return Workflow._get_path(
result = context[path[1:]]
elif source is not None:
result = Workflow._get_path(
context[source], path.split('.'))
else:
return Workflow._get_path(
result = Workflow._get_path(
context['/dataSource'],
Workflow._correct_position(path, context))
if not result and default is not None:
result = default
return result
@staticmethod
def _set_func(path, context, body, engine, target=None, **kwargs):
body_data = engine.evaluate_content(body, context)

2
data/workflows/AD.xml
View File

@ -25,7 +25,7 @@
</parameter>
<parameter name="arguments">
<map>
<argument name="InstanceType">m1.medium</argument>
<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
<argument name="ImageName">ws-2012-full</argument>
</map>
</parameter>

2
data/workflows/AspNetApps.xml
View File

@ -25,7 +25,7 @@
</parameter>
<parameter name="arguments">
<map>
<argument name="InstanceType">m1.medium</argument>
<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
<argument name="ImageName">ws-2012-full</argument>
</map>
</parameter>

2
data/workflows/MsSqlServer.xml
View File

@ -25,7 +25,7 @@
</parameter>
<parameter name="arguments">
<map>
<argument name="InstanceType">m1.medium</argument>
<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
<argument name="ImageName">ws-2012-full</argument>
</map>
</parameter>