openstack/heat
Code Issues Proposed changes

Merge "Fix some docstrings for octavia resources"

Browse Source
This commit is contained in:
Zuul 2018-02-07 06:03:55 +00:00 committed by Gerrit Code Review
commit fd41f34d95
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/resources/openstack/octavia/listener.py
View File

@ -73,8 +73,7 @@ class Listener(octavia_base.OctaviaBase):
), ),
DEFAULT_POOL: properties.Schema( DEFAULT_POOL: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('ID or name of the default pool for the listener. Requires ' _('ID or name of the default pool for the listener.'),
'shared_pools service extension.'),
update_allowed=True, update_allowed=True,
constraints=[ constraints=[
constraints.CustomConstraint('octavia.pool') constraints.CustomConstraint('octavia.pool')

5
heat/engine/resources/openstack/octavia/pool.py
View File

@ -23,7 +23,7 @@ from heat.engine import translation
class Pool(octavia_base.OctaviaBase): class Pool(octavia_base.OctaviaBase):
"""A resource for managing Octavia Pools. """A resource for managing Octavia Pools.
This resources manages octavia LBaaS v2 Pools, which represent a group This resources manages octavia LBaaS Pools, which represent a group
of nodes. Pools define the subnet where nodes reside, balancing algorithm, of nodes. Pools define the subnet where nodes reside, balancing algorithm,
and the nodes themselves. and the nodes themselves.
""" """
@ -111,8 +111,7 @@ class Pool(octavia_base.OctaviaBase):
), ),
LOADBALANCER: properties.Schema( LOADBALANCER: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('Loadbalancer name or ID to be associated with this pool. ' _('Loadbalancer name or ID to be associated with this pool.'),
'Requires shared_pools service extension.'),
constraints=[ constraints=[
constraints.CustomConstraint('octavia.loadbalancer') constraints.CustomConstraint('octavia.loadbalancer')
], ],