Build ceilometer 2015.1.0 (stable/kilo)

[openstack-build/ceilometer-build.git] / trusty / debian / patches / disable-kafka.patch

diff --git a/trusty/debian/patches/disable-kafka.patch b/trusty/debian/patches/disable-kafka.patch
new file mode 100644 (file)
index 0000000..1e0d4b2
--- /dev/null
+++ b/trusty/debian/patches/disable-kafka.patch
@@ -0,0 +1,39 @@
+--- a/ceilometer/tests/publisher/test_kafka_broker_publisher.py
++++ b/ceilometer/tests/publisher/test_kafka_broker_publisher.py
+@@ -15,13 +15,17 @@
+ """Tests for ceilometer/publisher/kafka_broker.py
+ """
+ import datetime
++import testtools
+ import uuid
+ 
+ import mock
+ from oslo_utils import netutils
+ 
+ from ceilometer.event.storage import models as event
+-from ceilometer.publisher.kafka_broker import KafkaBrokerPublisher
++try:
++    from ceilometer.publisher.kafka_broker import KafkaBrokerPublisher
++except ImportError:
++    kafka_publisher = None
+ from ceilometer import sample
+ from ceilometer.tests import base as tests_base
+ 
+@@ -93,6 +97,7 @@
+         ),
+     ]
+ 
++    @testtools.skipIf(kafka_publisher is None, "Kafka not avaliable, skipping")
+     def setUp(self):
+         super(TestKafkaPublisher, self).setUp()
+ 
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -9,7 +9,6 @@
+ iso8601>=0.1.9
+ jsonpath-rw>=1.2.0,<2.0
+ jsonschema>=2.0.0,<3.0.0
+-kafka-python>=0.9.2 # Apache-2.0
+ keystonemiddleware>=1.5.0,<1.6.0
+ lxml>=2.3
+ msgpack-python>=0.4.0