Move eventlet using commands into own directory

The api server does not need and should not use eventlet since it is
now using a multi-process capable web server from Werkzeug so is
kept above the eventlet directory where eventlet overriding
happens.

Partially-Implements: blueprint remove-web-eventlet
Change-Id: I377a105a5e53c3c548354877cac477609bf06b63

ceilometer/cmd/__init__.py

@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright 2014 OpenStack Foundation
-#
-# 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 eventlet
-# NOTE(jd) We need to monkey patch the socket and select module for,
-# at least, oslo.messaging, otherwise everything's blocked on its
-# first read() or select(), thread need to be patched too, because
-# oslo.messaging use threading.local
-eventlet.monkey_patch(socket=True, select=True, thread=True, time=True)

ceilometer/cmd/eventlet/__init__.py

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+#
+# Copyright 2014 OpenStack Foundation
+#
+# 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 eventlet
+# NOTE(jd) We need to monkey patch the socket and select module for,
+# at least, oslo.messaging, otherwise everything's blocked on its
+# first read() or select(), thread need to be patched too, because
+# oslo.messaging use threading.local
+eventlet.monkey_patch(socket=True, select=True, thread=True, time=True)

ceilometer/opts.py

@@ -20,8 +20,7 @@ import ceilometer.alarm.service
 import ceilometer.api
 import ceilometer.api.app
 import ceilometer.api.controllers.v2.alarms
-import ceilometer.cmd.alarm
+import ceilometer.cmd.eventlet.polling
-import ceilometer.cmd.polling
 import ceilometer.collector
 import ceilometer.compute.discovery
 import ceilometer.compute.notifications
@@ -68,7 +67,7 @@ def list_opts():
         ('DEFAULT',
          itertools.chain(ceilometer.agent.base.OPTS,
                          ceilometer.api.app.OPTS,
-                         ceilometer.cmd.polling.CLI_OPTS,
+                         ceilometer.cmd.eventlet.polling.CLI_OPTS,
                          ceilometer.compute.notifications.OPTS,
                          ceilometer.compute.util.OPTS,
                          ceilometer.compute.virt.inspector.OPTS,

setup.cfg

@@ -328,18 +328,18 @@ paste.filter_factory =
 
 console_scripts =
     ceilometer-api = ceilometer.cmd.api:main
-    ceilometer-agent-central = ceilometer.cmd.polling:main_central
+    ceilometer-agent-central = ceilometer.cmd.eventlet.polling:main_central
-    ceilometer-agent-compute = ceilometer.cmd.polling:main_compute
+    ceilometer-agent-compute = ceilometer.cmd.eventlet.polling:main_compute
-    ceilometer-polling = ceilometer.cmd.polling:main
+    ceilometer-polling = ceilometer.cmd.eventlet.polling:main
-    ceilometer-agent-notification = ceilometer.cmd.agent_notification:main
+    ceilometer-agent-notification = ceilometer.cmd.eventlet.agent_notification:main
-    ceilometer-agent-ipmi = ceilometer.cmd.polling:main_ipmi
+    ceilometer-agent-ipmi = ceilometer.cmd.eventlet.polling:main_ipmi
-    ceilometer-send-sample = ceilometer.cmd.sample:send_sample
+    ceilometer-send-sample = ceilometer.cmd.eventlet.sample:send_sample
-    ceilometer-dbsync = ceilometer.cmd.storage:dbsync
+    ceilometer-dbsync = ceilometer.cmd.eventlet.storage:dbsync
-    ceilometer-expirer = ceilometer.cmd.storage:expirer
+    ceilometer-expirer = ceilometer.cmd.eventlet.storage:expirer
-    ceilometer-rootwrap = oslo_rootwrap.cmd:main
+    ceilometer-rootwrap = oslo_rootwrap.cmd.eventlet:main
-    ceilometer-collector = ceilometer.cmd.collector:main
+    ceilometer-collector = ceilometer.cmd.eventlet.collector:main
-    ceilometer-alarm-evaluator = ceilometer.cmd.alarm:evaluator
+    ceilometer-alarm-evaluator = ceilometer.cmd.eventlet.alarm:evaluator
-    ceilometer-alarm-notifier = ceilometer.cmd.alarm:notifier
+    ceilometer-alarm-notifier = ceilometer.cmd.eventlet.alarm:notifier
 
 ceilometer.dispatcher =
     database = ceilometer.dispatcher.database:DatabaseDispatcher