Merge "Move eventlent monkeypatch out of cmd/"

2 files changed, 22 insertions, 9 deletions

diff --git a/ironic/__init__.py b/ironic/__init__.py
index e69de29bb..e4c759d36 100644
--- a/ironic/__init__.py
+++ b/ironic/__init__.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import os
+
+os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
+
+import eventlet
+
+eventlet.monkey_patch(os=False)
diff --git a/ironic/cmd/__init__.py b/ironic/cmd/__init__.py
index 895c24407..8513749e8 100644
--- a/ironic/cmd/__init__.py
+++ b/ironic/cmd/__init__.py
@@ -13,14 +13,5 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# TODO(deva): move eventlet imports to ironic.__init__ once we move to PBR
-import os
-
-os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
-
-import eventlet
-
-eventlet.monkey_patch(os=False)
-
 from ironic.openstack.common import gettextutils
 gettextutils.install('ironic')