From 7a7926e6b472d48d02863ac6918921100862ca99 Mon Sep 17 00:00:00 2001
From: John Tran <jhtran@att.com>
Date: Fri, 6 Sep 2013 20:58:24 +0000
Subject: [PATCH] Temporary fix agent-compute dpkg bug 1221945

See https://bugs.launchpad.net/cloud-archive/+bug/1221945
The ubuntu cloud archive ceilometer-agent-compute pkg has a bug in which init
script isn't installing properly gets installed as:
/etc/init/ceilometer-agent.conf.dpk-new therefore until it gets fixed this temp
solution works

Change-Id: I0f017c834e23fb731e5ca57fb9ab90826072c1cd
---
 CHANGELOG.md             |  5 +++++
 metadata.rb              |  2 +-
 recipes/agent-compute.rb | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1b4ec4..119e1c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ openstack-metering Cookbook CHANGELOG
 This file is used to list changes made in each version of the openstack-metering cookbook.
 
 
+v7.0.3
+------
+### Bug
+- Ubuntu cloud archive dpkg failing to install init script properly for agent-compute
+
 v7.0.2
 ------
 ### Improvement
diff --git a/metadata.rb b/metadata.rb
index 0285808..fec5380 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@ maintainer_email "cookbooks@lists.tfoundry.com"
 license          "Apache 2.0"
 description      "The OpenStack Metering service Ceilometer."
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "7.0.2"
+version          "7.0.3"
 
 recipe "openstack-metering::agent-central", "Installs agent central service."
 recipe "openstack-metering::agent-compute", "Installs agent compute service."
diff --git a/recipes/agent-compute.rb b/recipes/agent-compute.rb
index 3c9b3b6..f9dbf09 100644
--- a/recipes/agent-compute.rb
+++ b/recipes/agent-compute.rb
@@ -25,6 +25,16 @@ platform["agent_compute_packages"].each do |pkg|
   package pkg
 end
 
+# temp fix for compute-agent init not installing properly ubuntu
+# See https://bugs.launchpad.net/cloud-archive/+bug/1221945
+if node["platform"] == "ubuntu"
+  init_script = "/etc/init/ceilometer-agent-compute.conf"
+  execute "fix init script" do
+    command "cp #{init_script}.dpkg-new #{init_script}"
+    not_if { ::File.exists?(init_script) }
+  end
+end
+
 service platform["agent_compute_service"] do
   action :start
 end