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
+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)
+++ /dev/null
---- 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