x
/
timmy
Code Issues Proposed changes

Change: fuel postgres dump collection 

We now attempt to collect the dump disregarding the release
For both postgres in docker and in main system.
Two files will always be present in collected results:
fuel-docker-postgres-backup and fuel-postgres-backup
One of them will be empty, the other will contain the backup.

Which one is empty depends on whether postgres is in docker or not.

Change-Id: I9627fb00595ae8ce21188727b8d3de71b64fbcf1
This commit is contained in:
Dmitry Sutyagin 2016-11-29 18:50:12 -08:00
parent d5b268cf72
commit 0799872729
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timmy/env.py
View File

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

18
timmy_data/rq/default.yaml
View File

@ -54,40 +54,40 @@ scripts:
controller: [nova-manage-vm-list]
'5.0':
by_roles:
fuel: [fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
fuel: [fuel-docker-ps, fuel-dockerctl-check]
controller: [nova-manage-vm-list]
'5.0.1':
by_roles:
fuel: [fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
fuel: [fuel-docker-ps, fuel-dockerctl-check]
controller: [nova-manage-vm-list]
'5.1':
by_roles:
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check]
controller: [nova-manage-vm-list]
'5.1.1':
by_roles:
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker]
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check]
controller: [nova-manage-vm-list]
'6.0':
by_roles:
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images]
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, docker-images]
compute: [ipset-save, ipset-list]
controller: [ipset-save, ipset-list, nova-manage-vm-list]
'6.1':
by_roles:
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images]
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, docker-images]
controller: [nova-manage-vm-list]
'7.0':
by_roles:
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images]
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, docker-images]
'8.0':
by_roles:
fuel: [fuel-notifications, fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, postgres-dump-docker, docker-images, fuel-bootstrap-list]
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]
by_roles:
fuel: [fuel-release, fuel-task-list, fuel-environment-list]
fuel: [fuel-release, fuel-task-list, fuel-environment-list, fuel-docker-postgres-dump, 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,

3
timmy_data/rq/scripts/fuel-docker-postgres-dump Normal file
View File

@ -0,0 +1,3 @@
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'

1
timmy_data/rq/scripts/fuel-postgres-dump
View File

@ -1 +1,2 @@
which pg_dumpall > /dev/null || exit 0
su postgres -c 'pg_dumpall --clean'

1
timmy_data/rq/scripts/postgres-dump-docker
View File

@ -1 +0,0 @@
dockerctl shell postgres su postgres -c 'pg_dumpall --clean'