From bfa34fe1eef262f96963bdbe970e7c131e49dffd Mon Sep 17 00:00:00 2001 From: rabi Date: Fri, 2 Feb 2018 09:29:19 +0530 Subject: [PATCH] Fix some docstrings for octavia resources There is no concept of service extensions, supported by default. Change-Id: Icd4f4e054417aa4ee4ccdd995c50948f75eb697e --- heat/engine/resources/openstack/octavia/listener.py | 3 +-- heat/engine/resources/openstack/octavia/pool.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/heat/engine/resources/openstack/octavia/listener.py b/heat/engine/resources/openstack/octavia/listener.py index e46e3b2da0..ad2ee82b38 100644 --- a/heat/engine/resources/openstack/octavia/listener.py +++ b/heat/engine/resources/openstack/octavia/listener.py @@ -73,8 +73,7 @@ class Listener(octavia_base.OctaviaBase): ), DEFAULT_POOL: properties.Schema( properties.Schema.STRING, - _('ID or name of the default pool for the listener. Requires ' - 'shared_pools service extension.'), + _('ID or name of the default pool for the listener.'), update_allowed=True, constraints=[ constraints.CustomConstraint('octavia.pool') diff --git a/heat/engine/resources/openstack/octavia/pool.py b/heat/engine/resources/openstack/octavia/pool.py index c459e68152..81737c23b7 100644 --- a/heat/engine/resources/openstack/octavia/pool.py +++ b/heat/engine/resources/openstack/octavia/pool.py @@ -23,7 +23,7 @@ from heat.engine import translation class Pool(octavia_base.OctaviaBase): """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, and the nodes themselves. """ @@ -111,8 +111,7 @@ class Pool(octavia_base.OctaviaBase): ), LOADBALANCER: properties.Schema( properties.Schema.STRING, - _('Loadbalancer name or ID to be associated with this pool. ' - 'Requires shared_pools service extension.'), + _('Loadbalancer name or ID to be associated with this pool.'), constraints=[ constraints.CustomConstraint('octavia.loadbalancer') ],