Fix: merge postgres dump

Added: logrotate config file

Change-Id: I4525f30197d178dbaf2af85fe20d961902deec06
(cherry picked from commit fc6151fbb8deec4f27b9bf6895a762dc9db11b68)

specs/python-timmy.spec

@@ -4,7 +4,7 @@
 %global pypi_name timmy
 
 Name:           python-%{pypi_name}
-Version:        1.24.1
+Version:        1.24.2
 Release:        1%{?dist}~mos0
 Summary:        Log collector tool for OpenStack Fuel
 
@@ -72,7 +72,8 @@ rm -rf html/.{doctrees,buildinfo}
 
 %install
 %{__python2} setup.py install --skip-build --root %{buildroot}
-
+install -d -m 755 %{buildroot}/etc/logrotate.d
+install -m 644 logrotate.d/timmy %{buildroot}/etc/logrotate.d/timmy
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
@@ -86,6 +87,7 @@ popd
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}_data
 %{python2_sitelib}/*.egg-info
+%config(noreplace,missingok)	/etc/logrotate.d/timmy
 
 %if 0%{?with_docs}
 %files doc
@@ -100,10 +102,14 @@ popd
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}_data
 %{python3_sitelib}/*.egg-info
+%config(noreplace,missingok)	/etc/logrotate.d/timmy
 %endif
 
 
 %changelog
+* Wed Dec 7 2016 Aleksandr Dobdin <adobdin@mirantis.com> - 1.24.2
+- Fix: merge postgres dump
+
 * Tue Dec 6 2016 Alexander Lemeshko <oliemieshko@mirantis.com> - 1.24.1
 - Fix: fake not implemented for commands
 

timmy/env.py

@@ -16,7 +16,7 @@
 #    under the License.
 
 project_name = 'timmy'
-version = '1.24.1'
+version = '1.24.2'
 
 if __name__ == '__main__':
     import sys

timmy_data/rq/default.yaml

@@ -50,7 +50,6 @@ scripts:
         controller: [nova-manage-vm-list]
     '4.1.1':
       by_roles:
-        fuel: [fuel-postgres-dump]
         controller: [nova-manage-vm-list]
     '5.0':
       by_roles:
@@ -85,9 +84,9 @@ scripts:
         fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, docker-images, fuel-bootstrap-list]
     '9.0':
       by_roles:
-        fuel: [fuel-notifications, fuel-postgres-dump, fuel-bootstrap-list, shotgun2-report]
+        fuel: [fuel-notifications, fuel-bootstrap-list, shotgun2-report]
   by_roles:
-    fuel: [fuel-release, fuel-task-list, fuel-environment-list, fuel-docker-postgres-dump, fuel-postgres-dump]
+    fuel: [fuel-release, fuel-task-list, fuel-environment-list, fuel-postgres-dump]
     cinder: [ovs-vsctl-show, cinder-manage]
     compute: [ovs-dump-flows, ovs-ofctl-show-bridges, ovs-vsctl-show]
     controller: [rabbitmqctl-list-queues, nova-service-list,

timmy_data/rq/scripts/fuel-docker-postgres-dump

@@ -1,3 +0,0 @@
-which docker > /dev/null || exit 0
-service docker status > /dev/null || exit 0
-docker images | grep -c postgres > /dev/null && dockerctl shell postgres su postgres -c 'pg_dumpall --clean'

timmy_data/rq/scripts/fuel-postgres-dump

@@ -1,2 +1,14 @@
-which pg_dumpall > /dev/null || exit 0
+#!/bin/bash
-su postgres -c 'pg_dumpall --clean'
+
+( `# check if docker present` \
+command -v docker &> /dev/null && \
+service docker status &> /dev/null && \
+docker images | grep -c postgres > /dev/null && \
+dockerctl shell postgres su postgres -c 'pg_dumpall --clean'\
+) \
+\
+|| \
+( `# if docker stopped` \
+command -v pg_dumpall && \
+su postgres -c 'pg_dumpall --clean'\
+)