From 038379060c2246eea6377ccb1cebee155e25ac09 Mon Sep 17 00:00:00 2001
From: Volodymyr Kornylyuk <vkornylyuk@mirantis.com>
Date: Wed, 21 Sep 2016 13:26:04 +0300
Subject: [PATCH] Ceilometer config on compute, other fixes

- kafka url on compute
- oslo package update
- create topics before ceilometer start

Change-Id: I6af7e9a2bc88dbe51db9bbf45fcbce7f44893a41
---
 .../puppet/manifests/configure-compute.pp       | 17 +++++++++++++++++
 .../puppet/manifests/configure.pp               |  6 +++++-
 deployment_tasks.yaml                           | 14 ++++++++++++++
 pre_build_hook                                  |  4 ++--
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 deployment_scripts/puppet/manifests/configure-compute.pp

diff --git a/deployment_scripts/puppet/manifests/configure-compute.pp b/deployment_scripts/puppet/manifests/configure-compute.pp
new file mode 100644
index 0000000..3c0a77f
--- /dev/null
+++ b/deployment_scripts/puppet/manifests/configure-compute.pp
@@ -0,0 +1,17 @@
+
+notice('MODULAR: fuel-plugin-telemetry: configure-compute.pp')
+
+if hiera('telemetry::kafka::enabled') {
+
+  $kafka_ips  = hiera('telemetry::kafka::broker_list')
+  $kafka_url  = "moskafka://${kafka_ips}"
+  ceilometer_config {
+    'oslo_messaging_notifications/transport_url': value => $kafka_url;
+    'oslo_messaging_kafka/consumer_group':        value => 'ceilometer';
+    'DEFAULT/transport_url':                      value => $kafka_url;
+    'DEFAULT/shuffle_time_before_polling_task':   value => 300;
+    'compute/resource_update_interval':           value => 600;
+  } ~>
+  service { 'ceilometer-polling':}
+
+}
diff --git a/deployment_scripts/puppet/manifests/configure.pp b/deployment_scripts/puppet/manifests/configure.pp
index e0e432c..3e44218 100644
--- a/deployment_scripts/puppet/manifests/configure.pp
+++ b/deployment_scripts/puppet/manifests/configure.pp
@@ -101,6 +101,11 @@ if hiera('telemetry::kafka::enabled') {
   ceilometer_config { 'coordination/backend_url': value => $zookeeper_url }
   aodh_config { 'coordination/backend_url':       value => $zookeeper_url }
 
+  package { 'python-kafka':
+    ensure => '1.2.5-1~u14.04+mos1'
+  } ->
+  package { 'python-oslo.messaging.kafka': }
+
 }
 
 # TODO validate values before proceed
@@ -165,4 +170,3 @@ class { 'telemetry':
   event_pipeline_file => $event_pipeline_file,
   publishers          => $ceilometer_publishers,
 }
-
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index c6a58ba..60b78e7 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -129,6 +129,20 @@
   test_post:
     cmd: ruby /etc/puppet/modules/openstack_tasks/examples/ceilometer/compute_post.rb
 
+- id: telemetry-ceilometer-configure-compute
+  type: puppet
+  version: 2.1.0
+  groups: [compute, compute-vmware]
+  required_for: [deploy_end]
+  requires: [telemetry-ceilometer-compute]
+  cross-depends:
+    - name: ceilometer-controller
+    - name: telemetry-hiera
+  parameters:
+    puppet_manifest: puppet/manifests/configure-compute.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 3600
+
 - id: telemetry-ceilometer-keystone
   type: puppet
   version: 2.1.0
diff --git a/pre_build_hook b/pre_build_hook
index beb9ff2..82b1793 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -19,9 +19,9 @@ download_packages \
 
 # Oslo messaging
 
-OSLO_REPO_URL="http://mirror.fuel-infra.org/mos-repos/ubuntu/snapshots/9.0-2016-09-19-100321/pool/main"
+OSLO_REPO_URL="http://mirror.fuel-infra.org/mos-repos/ubuntu/snapshots/9.0-2016-09-21-095249/pool/main"
 
-download_packages $OSLO_REPO_URL/p/python-oslo.messaging.kafka/python-oslo.messaging.kafka_0.0.1-1~u14.04%2bmos1_all.deb
+download_packages $OSLO_REPO_URL/p/python-oslo.messaging.kafka/python-oslo.messaging.kafka_0.0.1-1~u14.04%2bmos2_all.deb
 download_packages $OSLO_REPO_URL/p/python-kafka/python-kafka_1.2.5-1~u14.04%2bmos1_all.deb
 
 # Download Heka deb package