openstack/heat
Code Issues Proposed changes

Merge "Pass the environment into the Template class and not Stack"

Browse Source
This commit is contained in:
Jenkins
2015-03-18 03:28:34 +00:00
committed by Gerrit Code Review
parent c41ab27ec1 e3950a4e72
commit ead3f0acf2
25 changed files with 194 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
View File

@@ -90,9 +90,10 @@ class CloudServersTest(common.HeatTestCase):
def _setup_test_stack(self, stack_name):
t = template_format.parse(wp_template)
templ = template.Template(t)
templ = template.Template(
t, env=environment.Environment({'key_name': 'test'}))
stack = parser.Stack(self.ctx, stack_name, templ,
environment.Environment({'key_name': 'test'}),
stack_id=uuidutils.generate_uuid())
return (templ, stack)

4
contrib/rackspace/rackspace/tests/test_rackspace_dns.py
View File

@@ -101,11 +101,11 @@ class RackspaceDnsTest(common.HeatTestCase):
def _setup_test_cloud_dns_instance(self, name, parsed_t):
stack_name = '%s_stack' % name
t = parsed_t
templ = template.Template(t)
templ = template.Template(
t, env=environment.Environment({'name': 'test'}))
stack = parser.Stack(utils.dummy_context(),
stack_name,
templ,
environment.Environment({'name': 'test'}),
stack_id=str(uuid.uuid4()))
instance = cloud_dns.CloudDns(