Add environment_files to stack_create
This change adds support for Heat Stack environment files. Change-Id: Ie6145aa5fde71d93f1df802f16ae4969df5de929
This commit is contained in:
parent
1e738dbc91
commit
ee88b23113
@ -794,7 +794,10 @@ class OpenStackCloud(object):
|
|||||||
template_object=None, files=None,
|
template_object=None, files=None,
|
||||||
rollback=True,
|
rollback=True,
|
||||||
wait=False, timeout=180,
|
wait=False, timeout=180,
|
||||||
|
environment_files=None,
|
||||||
**parameters):
|
**parameters):
|
||||||
|
envfiles, env = template_utils.process_multiple_environments_and_files(
|
||||||
|
env_paths=environment_files)
|
||||||
tpl_files, template = template_utils.get_template_contents(
|
tpl_files, template = template_utils.get_template_contents(
|
||||||
template_file=template_file,
|
template_file=template_file,
|
||||||
template_url=template_url,
|
template_url=template_url,
|
||||||
@ -805,7 +808,8 @@ class OpenStackCloud(object):
|
|||||||
disable_rollback=not rollback,
|
disable_rollback=not rollback,
|
||||||
parameters=parameters,
|
parameters=parameters,
|
||||||
template=template,
|
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(
|
with _utils.shade_exceptions("Error creating stack {name}".format(
|
||||||
name=name)):
|
name=name)):
|
||||||
|
@ -120,6 +120,7 @@ class TestStack(base.TestCase):
|
|||||||
mock_heat.stacks.create.assert_called_once_with(
|
mock_heat.stacks.create.assert_called_once_with(
|
||||||
stack_name='stack_name',
|
stack_name='stack_name',
|
||||||
disable_rollback=False,
|
disable_rollback=False,
|
||||||
|
environment={},
|
||||||
parameters={},
|
parameters={},
|
||||||
template={},
|
template={},
|
||||||
files={}
|
files={}
|
||||||
@ -137,6 +138,7 @@ class TestStack(base.TestCase):
|
|||||||
mock_heat.stacks.create.assert_called_once_with(
|
mock_heat.stacks.create.assert_called_once_with(
|
||||||
stack_name='stack_name',
|
stack_name='stack_name',
|
||||||
disable_rollback=False,
|
disable_rollback=False,
|
||||||
|
environment={},
|
||||||
parameters={},
|
parameters={},
|
||||||
template={},
|
template={},
|
||||||
files={}
|
files={}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user