From 585bb7ea63a653ad02201356724defa1e0e85ea6 Mon Sep 17 00:00:00 2001 From: Khayam Gondal Date: Tue, 29 Dec 2015 11:22:53 -0700 Subject: [PATCH] Changed HOST_IP=172.16.10.10 in local.conf.sample to 127.0.0.1 for devstack. Applied fix https://github.com/openstack/tricircle/commit/50176d04aaeeac75971e9f50869638d9eeeea3e4 to avoid py27 test failure Close-Bug #1526204 Change-Id: Ie63a56e9a0c680a78f202c869dffd547cc2bad2f --- devstack/local.conf.sample | 2 +- tricircle/networking/plugin.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index df7765c4..fa478494 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -18,7 +18,7 @@ LOGFILE=/opt/stack/logs/stack.sh.log VERBOSE=True LOG_COLOR=True SCREEN_LOGDIR=/opt/stack/logs -HOST_IP=172.16.10.10 +HOST_IP=127.0.0.1 FIXED_RANGE=10.0.0.0/24 NETWORK_GATEWAY=10.0.0.1 FIXED_NETWORK_SIZE=256 diff --git a/tricircle/networking/plugin.py b/tricircle/networking/plugin.py index 779e83b3..51a08590 100644 --- a/tricircle/networking/plugin.py +++ b/tricircle/networking/plugin.py @@ -24,9 +24,7 @@ from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agentschedulers_db 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 l3_db from neutron.db import portbindings_db from neutron.db import securitygroups_db from neutron.i18n import _LI @@ -38,8 +36,6 @@ LOG = log.getLogger(__name__) class TricirclePlugin(db_base_plugin_v2.NeutronDbPluginV2, securitygroups_db.SecurityGroupDbMixin, - l3_db.L3_NAT_dbonly_mixin, - external_net_db.External_net_db_mixin, portbindings_db.PortBindingMixin, extradhcpopt_db.ExtraDhcpOptMixin, agentschedulers_db.DhcpAgentSchedulerDbMixin): @@ -52,8 +48,7 @@ class TricirclePlugin(db_base_plugin_v2.NeutronDbPluginV2, "extra_dhcp_opt", "binding", "security-group", - "external-net", - "router"] + "external-net"] def __init__(self): super(TricirclePlugin, self).__init__()