← Back to branch summary

~ubuntu-branches/ubuntu/utopic/heat/utopic

« back to all changes in this revision

Viewing changes to heat/engine/cfn/template.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Gauvain Pocentek
  • Date: 2014-07-25 10:08:14 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20140725100814-86phhyxr90ugg3hr
Tags: 2014.2~b2-0ubuntu1
https://launchpad.net/bugs/1320013
[ Chuck Short ]
* debian/control: Add python-oslo.messaging 
* debian/tests/heat-daemons: Dropped heat-enginge.
* debian/patches/fix-requirements.patch: Refreshed.
* debian/control: Add python-stevedore
* debian/control: Add python-posix-ipc.
* debian/patches/fix-requirements.patch: Remove routes 2.0 blockage.
* debian/patches/default-sqlite.patch: Refreshed.
* debian/patches/skip-tests.patch: Refreshed.
* debian/control: Add python-requests
* debian/rules: Temporarily disable testsuite.

[ Gauvain Pocentek ]
* debian/patches/default-log-dir.patch: define a default log directory to
  actually get logging to work (LP: #1320013).

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/cfn/template.py
53
53
        else:
54
54
            default = {}
55
55
 
56
 
        return self.t.get(section, default)
 
56
        # if a section is None (empty yaml section) return {}
 
57
        # to be consistent with an empty json section.
 
58
        return self.t.get(section) or default
57
59
 
58
60
    def param_schemata(self):
59
 
        params = self.t.get(self.PARAMETERS, {}).iteritems()
 
61
        params = self.t.get(self.PARAMETERS) or {}
60
62
        return dict((name, parameters.Schema.from_dict(name, schema))
61
 
                    for name, schema in params)
 
63
                    for name, schema in params.iteritems())
62
64
 
63
65
    def parameters(self, stack_identifier, user_params):
64
66
        return parameters.Parameters(stack_identifier, self,
125
127
                                                description=description)
126
128
            return name, defn
127
129
 
128
 
        resources = self.t.get(self.RESOURCES, {}).items()
129
 
        return dict(rsrc_defn_item(name, data) for name, data in resources)
 
130
        resources = self.t.get(self.RESOURCES) or {}
 
131
        return dict(rsrc_defn_item(name, data)
 
132
                    for name, data in resources.items())
130
133
 
131
134
    def add_resource(self, definition, name=None):
132
135
        if name is None:
145
148
        if len(cfn_tmpl.get(RES_DEPENDS_ON, [])) == 1:
146
149
            cfn_tmpl[RES_DEPENDS_ON] = cfn_tmpl[RES_DEPENDS_ON][0]
147
150
 
148
 
        self.t.setdefault(self.RESOURCES, {})[name] = cfn_tmpl
149
 
 
150
 
 
151
 
def template_mapping():
152
 
    return {
153
 
        ('HeatTemplateFormatVersion', '2012-12-12'): CfnTemplate,
154
 
        ('AWSTemplateFormatVersion', '2010-09-09'): CfnTemplate,
155
 
    }
 
151
        if self.t.get(self.RESOURCES) is None:
 
152
            self.t[self.RESOURCES] = {}
 
153
        self.t[self.RESOURCES][name] = cfn_tmpl