openstack/neutron
Code Issues Proposed changes

Merge "Remove dependency on memory heavy python-requests."

Browse Source
This commit is contained in:
Jenkins
2017-02-13 13:19:19 +00:00
committed by Gerrit Code Review
parent 521b1074f1 c34e11a2f8
commit bf79852410
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/l3/keepalived_state_change.py
View File

@@ -20,7 +20,6 @@ import httplib2
import netaddr import netaddr
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
import requests
from neutron._i18n import _, _LE from neutron._i18n import _, _LE
from neutron.agent.l3 import ha from neutron.agent.l3 import ha
@@ -105,7 +104,7 @@ class MonitorDaemon(daemon.Daemon):
'X-Neutron-State': state}, 'X-Neutron-State': state},
connection_type=KeepalivedUnixDomainConnection) connection_type=KeepalivedUnixDomainConnection)
if resp.status != requests.codes.ok: if resp.status != 200:
raise Exception(_('Unexpected response: %s') % resp) raise Exception(_('Unexpected response: %s') % resp)
LOG.debug('Notified agent router %s, state %s', self.router_id, state) LOG.debug('Notified agent router %s, state %s', self.router_id, state)

1
requirements.txt
View File

@@ -11,7 +11,6 @@ debtcollector>=1.2.0 # Apache-2.0
eventlet!=0.18.3,>=0.18.2 # MIT eventlet!=0.18.3,>=0.18.2 # MIT
pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
httplib2>=0.7.5 # MIT httplib2>=0.7.5 # MIT
requests!=2.12.2,>=2.10.0 # Apache-2.0
Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
keystonemiddleware>=4.12.0 # Apache-2.0 keystonemiddleware>=4.12.0 # Apache-2.0
netaddr!=0.7.16,>=0.7.13 # BSD netaddr!=0.7.16,>=0.7.13 # BSD