openstack
/
tacker
Code Issues Proposed changes

Merge "Removing unused clauses"

This commit is contained in:
Jenkins 2016-03-11 00:03:46 +00:00 committed by Gerrit Code Review
parent 6f6ac9d277 3574e23ec2
commit 8b0d413b1c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/install/devstack.rst
View File

@ -59,9 +59,10 @@ Install from Liberty
Multi Node Environment
~~~~~~~~~~~~~~~~~~~~~~
In a multi-node devstack environment where controller, network and compute nodes are separate, some
neutron agents should not be installed in the controller node. In such cases, use the following
local.conf setting to disable neutron agents in the controller node. ::
In a multi-node devstack environment where controller, network and compute
nodes are separate, some neutron agents should not be installed in the
controller node. In such cases, use the following local.conf setting to disable
neutron agents in the controller node::
[[local|localrc]]
TACKER_NEUTRON_AGENTS=''

5
tacker/vm/plugin.py
View File

@ -26,7 +26,6 @@ from oslo_config import cfg
from tacker.api.v1 import attributes
from tacker.common import driver_manager
from tacker.db.vm import proxy_db # noqa
from tacker.db.vm import vm_db
from tacker.extensions import vnfm
from tacker.openstack.common import excutils
@ -100,9 +99,9 @@ class VNFMMgmtMixin(object):
class VNFMPlugin(vm_db.VNFMPluginDb, VNFMMgmtMixin):
"""VNFMPlugin which supports VNFM framework."""
"""VNFMPlugin which supports VNFM framework.
"""Plugin which supports Tacker framework
Plugin which supports Tacker framework
"""
OPTS = [
cfg.ListOpt(