x/trio2o
Code Issues Proposed changes

Changed HOST_IP=172.16.10.10 in local.conf.sample to 127.0.0.1 for devstack.

Browse Source 
Applied fix 50176d04aa to avoid py27 test failure

Close-Bug  #1526204

Change-Id: Ie63a56e9a0c680a78f202c869dffd547cc2bad2f
This commit is contained in:
Khayam Gondal 2015-12-29 11:22:53 -07:00
parent bfc6a83048
commit 585bb7ea63
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/local.conf.sample
View File

@ -18,7 +18,7 @@ LOGFILE=/opt/stack/logs/stack.sh.log
VERBOSE=True VERBOSE=True
LOG_COLOR=True LOG_COLOR=True
SCREEN_LOGDIR=/opt/stack/logs SCREEN_LOGDIR=/opt/stack/logs
HOST_IP=172.16.10.10 HOST_IP=127.0.0.1
FIXED_RANGE=10.0.0.0/24 FIXED_RANGE=10.0.0.0/24
NETWORK_GATEWAY=10.0.0.1 NETWORK_GATEWAY=10.0.0.1
FIXED_NETWORK_SIZE=256 FIXED_NETWORK_SIZE=256

7
tricircle/networking/plugin.py
View File

@ -24,9 +24,7 @@ from neutron.common import rpc as n_rpc
from neutron.common import topics from neutron.common import topics
from neutron.db import agentschedulers_db from neutron.db import agentschedulers_db
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import external_net_db
from neutron.db import extradhcpopt_db from neutron.db import extradhcpopt_db
from neutron.db import l3_db
from neutron.db import portbindings_db from neutron.db import portbindings_db
from neutron.db import securitygroups_db from neutron.db import securitygroups_db
from neutron.i18n import _LI from neutron.i18n import _LI
@ -38,8 +36,6 @@ LOG = log.getLogger(__name__)
class TricirclePlugin(db_base_plugin_v2.NeutronDbPluginV2, class TricirclePlugin(db_base_plugin_v2.NeutronDbPluginV2,
securitygroups_db.SecurityGroupDbMixin, securitygroups_db.SecurityGroupDbMixin,
l3_db.L3_NAT_dbonly_mixin,
external_net_db.External_net_db_mixin,
portbindings_db.PortBindingMixin, portbindings_db.PortBindingMixin,
extradhcpopt_db.ExtraDhcpOptMixin, extradhcpopt_db.ExtraDhcpOptMixin,
agentschedulers_db.DhcpAgentSchedulerDbMixin): agentschedulers_db.DhcpAgentSchedulerDbMixin):
@ -52,8 +48,7 @@ class TricirclePlugin(db_base_plugin_v2.NeutronDbPluginV2,
"extra_dhcp_opt", "extra_dhcp_opt",
"binding", "binding",
"security-group", "security-group",
"external-net", "external-net"]
"router"]
def __init__(self): def __init__(self):
super(TricirclePlugin, self).__init__() super(TricirclePlugin, self).__init__()