From fcdca86e8ce7819cd70c6be965cdb8e5b9074b48 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 28 Sep 2019 18:28:16 +0200 Subject: [PATCH] Move the backup of the pg instance on postgresql-manda-01 to a more hiera and facter based setup --- data/common.yaml | 1 - data/nodes/postgresql-manda-01.debian.org.yaml | 3 +++ modules/postgres/manifests/backup_source.pp | 10 +--------- 3 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 data/nodes/postgresql-manda-01.debian.org.yaml diff --git a/data/common.yaml b/data/common.yaml index eee0c6dea..c4f515131 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -82,7 +82,6 @@ roles: - danzi.debian.org - fasolo.debian.org - lw07.debian.org - - postgresql-manda-01.debian.org - sallinen.debian.org - seger.debian.org - snapshotdb-manda-01.debian.org diff --git a/data/nodes/postgresql-manda-01.debian.org.yaml b/data/nodes/postgresql-manda-01.debian.org.yaml new file mode 100644 index 000000000..b640495d6 --- /dev/null +++ b/data/nodes/postgresql-manda-01.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::postgresql::server diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp index 97fccceec..c46d3b20e 100644 --- a/modules/postgres/manifests/backup_source.pp +++ b/modules/postgres/manifests/backup_source.pp @@ -39,15 +39,7 @@ class postgres::backup_source { } } - if $::hostname in [postgresql-manda-01] { - postgres::backup_cluster { "${::hostname}-bacula": - pg_version => '11', - pg_port => 5432, - pg_cluster => 'bacula', - } - } - - if $::hostname in [godard, danzi, postgresql-manda-01] { + if $::hostname in [godard, danzi] { postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}": } } -- 2.20.1