openstack/shade
Code Issues Proposed changes

Add environment_files to stack_create

Browse Source 
This change adds support for Heat Stack environment files.

Change-Id: Ie6145aa5fde71d93f1df802f16ae4969df5de929
This commit is contained in:
Tristan Cacqueray 2016-02-08 15:56:41 -05:00 committed by Steve Baker
parent 1e738dbc91
commit ee88b23113
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shade/openstackcloud.py
View File

@ -794,7 +794,10 @@ class OpenStackCloud(object):
template_object=None, files=None,
rollback=True,
wait=False, timeout=180,
environment_files=None,
**parameters):
envfiles, env = template_utils.process_multiple_environments_and_files(
env_paths=environment_files)
tpl_files, template = template_utils.get_template_contents(
template_file=template_file,
template_url=template_url,
@ -805,7 +808,8 @@ class OpenStackCloud(object):
disable_rollback=not rollback,
parameters=parameters,
template=template,
files=tpl_files,
files=dict(list(tpl_files.items()) + list(envfiles.items())),
environment=env,
)
with _utils.shade_exceptions("Error creating stack {name}".format(
name=name)):

2
shade/tests/unit/test_stack.py
View File

@ -120,6 +120,7 @@ class TestStack(base.TestCase):
mock_heat.stacks.create.assert_called_once_with(
stack_name='stack_name',
disable_rollback=False,
environment={},
parameters={},
template={},
files={}
@ -137,6 +138,7 @@ class TestStack(base.TestCase):
mock_heat.stacks.create.assert_called_once_with(
stack_name='stack_name',
disable_rollback=False,
environment={},
parameters={},
template={},
files={}