diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-02 17:34:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-02 17:34:42 +0000 |
| commit | d7e91a1bc39019c1212de5eead24b0af380e71ec (patch) | |
| tree | 603eb28bea4010c21fef7971031793bc0d0adfa9 /doc | |
| parent | 274bc4b2e1b65d225db4b07db64c4665b4705c94 (diff) | |
| parent | 0e374945c4ae271eb80d84eb4a2a8ec49f30c136 (diff) | |
| download | heat-d7e91a1bc39019c1212de5eead24b0af380e71ec.tar.gz | |
Merge "Doc: don't generate empty properties fields"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/ext/resources.py | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/doc/source/ext/resources.py b/doc/source/ext/resources.py index 22263d712..4a11a77ac 100644 --- a/doc/source/ext/resources.py +++ b/doc/source/ext/resources.py @@ -115,14 +115,17 @@ class ResourcePages(Directive): props.append('%s: %s' % (prop_key, self._prop_syntax_example(prop))) + props_str = '' + if props: + props_str = '''\n properties: + %s''' % ('\n '.join(props)) + template = '''heat_template_version: 2013-05-23 ... resources: ... the_resource: - type: %s - properties: - %s''' % (self.resource_type, '\n '.join(props)) + type: %s%s''' % (self.resource_type, props_str) block = nodes.literal_block('', template, language="hot") section.append(block) @@ -137,14 +140,17 @@ resources: props.append('%s: %s' % (prop_key, self._prop_syntax_example(prop))) + props_str = '' + if props: + props_str = '''\n Properties: + %s''' % ('\n '.join(props)) + template = '''HeatTemplateFormatVersion: '2012-12-12' ... Resources: ... TheResource: - Type: %s - Properties: - %s''' % (self.resource_type, '\n '.join(props)) + Type: %s%s''' % (self.resource_type, props_str) block = nodes.literal_block('', template, language='yaml') section.append(block) @@ -159,18 +165,23 @@ Resources: and prop.support_status.status == support.SUPPORTED): props.append('"%s": %s' % (prop_key, self._prop_syntax_example(prop))) + + props_str = '' + if props: + props_str = ''',\n "Properties": { + %s + }''' % (',\n '.join(props)) + template = '''{ "AWSTemplateFormatVersion" : "2010-09-09", ... "Resources" : { "TheResource": { - "Type": "%s", - "Properties": { - %s - } + "Type": "%s"%s } } -}''' % (self.resource_type, ',\n '.join(props)) +}''' % (self.resource_type, props_str) + block = nodes.literal_block('', template, language="json") section.append(block) |