From d53f181dc050da880556c53644d1469f15421689 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Tue, 31 Mar 2015 12:45:13 +0200 Subject: [PATCH] Add backup scripts to ask.o.o site Backup resources for bup and pgsql database backup. Need to add keys and setup user manually at bup server side, as described in CI doc: http://ci.openstack.org/sysadmin.html#backups Change-Id: I55cca70f891eb18775b0585532b8c34a0dd40787 Depends-On: I13d542ef5a2a74f14ab42d3421938532edf75f93 --- modules.env | 1 + modules/openstack_project/manifests/ask.pp | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/modules.env b/modules.env index 82144f433b..7ffac429fa 100644 --- a/modules.env +++ b/modules.env @@ -95,6 +95,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openafs"]="origi INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstackci"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstackid"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-packagekit"]="origin/master" +INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-pgsql_backup"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-pip"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-planet"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-project_config"]="origin/master" diff --git a/modules/openstack_project/manifests/ask.pp b/modules/openstack_project/manifests/ask.pp index 6d2e723e52..8e400b9133 100644 --- a/modules/openstack_project/manifests/ask.pp +++ b/modules/openstack_project/manifests/ask.pp @@ -135,4 +135,16 @@ class openstack_project::ask ( db_password => $db_password, require => [ Class['redis'], Class['askbot'] ], } + + pgsql_backup::backup { $db_name: + database_user => $db_user, + database_password => $db_password, + require => Postgresql::Server::Db[$db_name], + } + + include bup + bup::site { 'rs-ord': + backup_user => 'bup-ask', + backup_server => 'ci-backup-rs-ord.openstack.org', + } }