openstack/deb-heat
Code Issues Proposed changes

Merge "Fix some sphinx warnings/errors"

Browse Source
This commit is contained in:
Jenkins 2014-10-01 16:45:14 +00:00 committed by Gerrit Code Review
commit 52cbdb080b
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/source/template_guide/contrib.rst
View File

@ -27,7 +27,7 @@ a generic Openstack deployment and the Rackspace Cloud.
Rackspace resources depend on the dev branch of Rackspace resources depend on the dev branch of
`pyrax <https://github.com/rackspace/pyrax/tree/dev>`_ to work `pyrax <https://github.com/rackspace/pyrax/tree/dev>`_ to work
properly. More information about them can be found in the properly. More information about them can be found in the
`README `RACKSPACE_README
<https://github.com/openstack/heat/blob/master/contrib/rackspace/README.md>`_. <https://github.com/openstack/heat/blob/master/contrib/rackspace/README.md>`_.
@ -41,20 +41,19 @@ DockerInc Resource
This plugin enables the use of Docker containers in a Heat template and This plugin enables the use of Docker containers in a Heat template and
requires the `docker-py <https://pypi.python.org/pypi/docker-py>`_ requires the `docker-py <https://pypi.python.org/pypi/docker-py>`_
package. You can find more information in the `README package. You can find more information in the `DOCKER_README
<https://github.com/openstack/heat/blob/master/contrib/heat_docker/heat_docker <https://github.com/openstack/heat/blob/master/contrib/heat_docker/README.md>`_.
/README.md>`_.
.. resourcepages:: DockerInc:: .. resourcepages:: DockerInc::
Nova Flavor Resource Nova Flavor Resource
------------------ --------------------
.. rubric:: This resource is not enabled by default. .. rubric:: This resource is not enabled by default.
This plugin enables dynamic creation of Nova flavors through Heat. You can This plugin enables dynamic creation of Nova flavors through Heat. You can
find more information in the `README find more information in the `NOVA_FLAVOR_README
<https://github.com/openstack/heat/blob/master/contrib/nova_flavor/nova_flavor <https://github.com/openstack/heat/blob/master/contrib/nova_flavor
/README.md>`_. /README.md>`_.
.. resourcepages:: NovaFlavor:: .. resourcepages:: NovaFlavor::

4
doc/source/template_guide/hot_spec.rst
View File

@ -382,7 +382,7 @@ For example:
constraints: constraints:
- custom_constraint: nova.keypair - custom_constraint: nova.keypair
.. _hot_spec_pseudo_parameters .. _hot_spec_pseudo_parameters:
Pseudo Parameters Pseudo Parameters
----------------- -----------------
@ -727,7 +727,7 @@ given as single parameter to the get_resource function.
list_join list_join
-------- ---------
The *list_join* function joins a list of strings with the given delimiter. This The *list_join* function joins a list of strings with the given delimiter. This
function is available beginning with the `2014-10-16` version of HOT. function is available beginning with the `2014-10-16` version of HOT.
The syntax of the list_join function is as follows: The syntax of the list_join function is as follows:

6
heat/engine/clients/os/neutron.py
View File

@ -86,10 +86,10 @@ class NeutronClientPlugin(client_plugin.ClientPlugin):
return subnet_info['subnet']['network_id'] return subnet_info['subnet']['network_id']
def get_secgroup_uuids(self, security_groups): def get_secgroup_uuids(self, security_groups):
''' '''Returns a list of security group UUIDs.
Returns a list of security group UUIDs.
Args: Args:
security_groups: List of security group names or UUIDs security_groups: List of security group names or UUIDs
''' '''
seclist = [] seclist = []
all_groups = None all_groups = None

6
heat/engine/properties.py
View File

@ -471,8 +471,7 @@ class Properties(collections.Mapping):
@classmethod @classmethod
def schema_to_parameters_and_properties(cls, schema): def schema_to_parameters_and_properties(cls, schema):
"""Generates properties with params resolved for a resource's
'''Generates properties with params resolved for a resource's
properties_schema. properties_schema.
:param schema: A resource type's properties_schema :param schema: A resource type's properties_schema
@ -487,7 +486,8 @@ class Properties(collections.Mapping):
'bar': {'Type': 'Json'}}, 'bar': {'Type': 'Json'}},
{'foo': {'Fn::Split': {'Ref': 'foo'}}, {'foo': {'Fn::Split': {'Ref': 'foo'}},
'bar': {'Ref': 'bar'}} 'bar': {'Ref': 'bar'}}
'''
"""
def param_prop_def_items(name, schema): def param_prop_def_items(name, schema):
param_def = cls._param_def_from_prop(schema) param_def = cls._param_def_from_prop(schema)
prop_def = cls._prop_def_from_prop(name, schema) prop_def = cls._prop_def_from_prop(name, schema)