summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPooja Ghumre <pooja@platform9.com>2017-01-31 17:53:12 -0800
committerKaustubh Phatak <kphatak@platform9.com>2017-06-09 16:27:06 -0700
commit84a82381188907707769f6f86a8f99397f035a01 (patch)
tree3903bd4ed93ef1dcc7cc9893f5d4f20847698b3a
parentb38b97f446b626216cf0d7644256d4dbb764134d (diff)
Fix select.epoll() not found AttributeError by changing import orderHEADmaster
Notes
Notes (review): Code-Review+2: Kaustubh Phatak <kphatak@platform9.com> Workflow+1: Kaustubh Phatak <kphatak@platform9.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 09 Jun 2017 23:27:35 +0000 Reviewed-on: https://review.openstack.org/472865 Project: openstack/mors Branch: refs/heads/master
-rw-r--r--mors/pf9_mors.py6
-rw-r--r--setup.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/mors/pf9_mors.py b/mors/pf9_mors.py
index eb5b9a4..c2a0f91 100644
--- a/mors/pf9_mors.py
+++ b/mors/pf9_mors.py
@@ -15,15 +15,15 @@ See the License for the specific language governing permissions and
15limitations under the License. 15limitations under the License.
16""" 16"""
17 17
18from paste.deploy import loadapp
19from eventlet import wsgi
20import eventlet 18import eventlet
19eventlet.monkey_patch()
20from eventlet import wsgi
21from paste.deploy import loadapp
21import argparse, logging 22import argparse, logging
22import logging.handlers 23import logging.handlers
23import ConfigParser, os 24import ConfigParser, os
24from mors import mors_wsgi 25from mors import mors_wsgi
25 26
26eventlet.monkey_patch()
27def _get_arg_parser(): 27def _get_arg_parser():
28 parser = argparse.ArgumentParser(description="Lease Manager for VirtualMachines") 28 parser = argparse.ArgumentParser(description="Lease Manager for VirtualMachines")
29 parser.add_argument('--config-file', dest='config_file', default='/etc/pf9/pf9-mors.ini') 29 parser.add_argument('--config-file', dest='config_file', default='/etc/pf9/pf9-mors.ini')
diff --git a/setup.py b/setup.py
index b0b440f..3663cd0 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ setup(name='mors',
43 'sqlalchemy-migrate==0.9.5', 43 'sqlalchemy-migrate==0.9.5',
44 'PyMySQL', 44 'PyMySQL',
45 'eventlet==0.18.4', 45 'eventlet==0.18.4',
46 'requests==2.13',
46 'nose', 47 'nose',
47 'proboscis' 48 'proboscis'
48 ], 49 ],