Remove patch from Ceilometer source package

  Remove disable-kafka.patch because of changes which were
  made directly to the code [1]..

  [1] Change-Id: I8d460b3c73167ee38db76d3b902dffc19212682b

  Fix runtests.sh script to work with mysql:
  remove /etc/mysql/conf.d/wsrep.cnf file
  Related-bug: #1475288

Change-Id: Ieb5de54841e9f23e7bfff8deef2a2ba3b5227ffb

diff --git a/tests/runtests.sh b/tests/runtests.sh
index b202f0aeacf0e8bf379fd6c731a5111a20e33b49..29f8093f36dcd17ddfa3a9ef29b883763e4de728 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -133,6 +133,9 @@ install_and_setup_mysql() {
    echo "mysql-server mysql-server/root_password select ${mysql_pass}" | debconf-set-selections
    echo "mysql-server mysql-server/root_password_again select ${mysql_pass}" | debconf-set-selections
    ${command_to_install} mysql-server-5.6 mysql-client-core-5.6 python-mysqldb
+   if [ -f "/etc/mysql/conf.d/wsrep.cnf" ]; then
+     rm -f /etc/mysql/conf.d/wsrep.cnf
+   fi
 
    service ${mysql_service} restart
    sleep 5

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 06bdcc75a0066329c625f3888cc6ea98b03677e1..23667a1db7c23b86cbcde5a8a4deeb5c3597b349 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,12 @@
+ceilometer (2015.1.0-1~u14.04+mos3) mos7.0; urgency=medium
+
+  * Remove disable-kafka.patch as of changes which were
+    made directly to the code [1]
+
+  [1] Change-Id: I8d460b3c73167ee38db76d3b902dffc19212682b
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Thu, 16 Jul 2015 13:39:28 +0300
+
 ceilometer (2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium
 
   * Fix names for Oslo libraries (use dots instead of dashes)

diff --git a/trusty/debian/patches/disable-kafka.patch b/trusty/debian/patches/disable-kafka.patch
deleted file mode 100644 (file)
index 1e0d4b2..0000000
--- a/trusty/debian/patches/disable-kafka.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 16fa7f5b3a285af13aecb1097d483a480b4042ca..39caafab11734bbf8d5071ef0e54ad6d98246f08 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,4 +1,3 @@
 skip-db-tests.patch
 skip-test.patch
 skip-gabbi.patch
-disable-kafka.patch