From 8f0bba60b88be4d05312633b3d6165ec15b0486f Mon Sep 17 00:00:00 2001
From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Wed, 29 Jul 2015 16:29:47 +0300
Subject: [PATCH] Improvements for ceilometer config generation

* Move config generation to post install stage
  to successfully include ceilometer namespace
* Remove override_dh_install from rules

Change-Id: I7ea148609db351cd56282d9dc4fb0a68f79b47ca
---
 tests/integration_tests.conf             |  1 +
 trusty/debian/ceilometer-common.install  |  1 -
 trusty/debian/ceilometer-common.postinst | 15 +++++++++++++++
 trusty/debian/changelog                  |  8 ++++++++
 trusty/debian/control                    |  2 ++
 trusty/debian/rules                      |  9 ---------
 6 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 tests/integration_tests.conf

diff --git a/tests/integration_tests.conf b/tests/integration_tests.conf
new file mode 100644
index 0000000..db22053
--- /dev/null
+++ b/tests/integration_tests.conf
@@ -0,0 +1 @@
+TEST_GROUP=smoke_neutron
diff --git a/trusty/debian/ceilometer-common.install b/trusty/debian/ceilometer-common.install
index e16dabf..62ca7db 100644
--- a/trusty/debian/ceilometer-common.install
+++ b/trusty/debian/ceilometer-common.install
@@ -1,5 +1,4 @@
 etc/ceilometer/api_paste.ini etc/ceilometer
-etc/ceilometer/ceilometer.conf etc/ceilometer
 etc/ceilometer/deprecated_pipeline.yaml etc/ceilometer/
 etc/ceilometer/event_definitions.yaml etc/ceilometer
 etc/ceilometer/event_pipeline.yaml etc/ceilometer/
diff --git a/trusty/debian/ceilometer-common.postinst b/trusty/debian/ceilometer-common.postinst
index 271dd31..9a9d45c 100644
--- a/trusty/debian/ceilometer-common.postinst
+++ b/trusty/debian/ceilometer-common.postinst
@@ -10,6 +10,21 @@ if [ "$1" = "configure" ]; then
     fi
 
     chmod 0775 /var/log/ceilometer
+
+    oslo-config-generator --output-file /etc/ceilometer/ceilometer.conf.sample \
+        --namespace ceilometer \
+        --namespace oslo.concurrency \
+        --namespace oslo.db \
+        --namespace oslo.messaging \
+        --namespace oslo.policy \
+        --namespace keystonemiddleware.auth_token 2>/dev/null
+
+    if [ "$?" -ne 0 ]; then
+        echo "Configuration file generetion fails!"
+    fi
+    if [ ! -f "/etc/ceilometer/ceilometer.conf" ]; then
+        cp /etc/ceilometer/ceilometer.conf.sample /etc/ceilometer/ceilometer.conf
+    fi
     chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer /var/log/ceilometer
 
     if grep -qE "^(sql_)?connection.*sqlite.*" /etc/ceilometer/ceilometer.conf
diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 2dd7efc..8c49185 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,11 @@
+ceilometer (2015.1.0-1~u14.04+mos5) mos7.0; urgency=medium
+
+  * Move config generation to post install stage
+    to successfully include ceilometer namespace
+  * Remove override_dh_install from rules
+
+ -- Ivan Berezovskiy <iberezovskiy@mirantis.com>  Wed, 29 Jul 2015 13:27:19 +0000
+
 ceilometer (2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium
 
   * Add ceilometer-doc package
diff --git a/trusty/debian/control b/trusty/debian/control
index 4f87fb8..855c643 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -73,6 +73,7 @@ Package: python-ceilometer
 Architecture: all
 Depends:
  openstack-pkg-tools (>= 21),
+ python-awsauth,
  python-all (>= 2.7.1),
  python-anyjson (>= 0.3.3),
  python-ceilometerclient (>= 1.0.13),
@@ -99,6 +100,7 @@ Depends:
  python-oslo.policy (>= 0.3.1),
  python-oslo.rootwrap (>= 1.6.0),
  python-oslo.serialization (>= 1.4.0),
+ python-oslo.vmware,
  python-oslo.utils (>= 1.4.0),
  python-pastedeploy (>= 1.5.0),
  python-posix-ipc,
diff --git a/trusty/debian/rules b/trusty/debian/rules
index ab614a1..8dd06ae 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -10,15 +10,6 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 %:
 	dh $@  --with python2,systemd,sphinxdoc
 
-override_dh_install:
-	oslo-config-generator --output-file etc/ceilometer/ceilometer.conf.sample \
-	    --namespace ceilometer \
-		--namespace oslo.db \
-		--namespace oslo.messaging \
-		--namespace keystonemiddleware.auth_token
-	cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
-	dh_install --fail-missing
-
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f etc/ceilometer/ceilometer.conf etc/ceilometer/ceilometer.conf.sample
-- 
2.32.3