diff --git a/modules.env b/modules.env index 2d8c3631bf..74c9e332f8 100644 --- a/modules.env +++ b/modules.env @@ -58,6 +58,7 @@ SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]= # Add modules that should be part of the openstack-infra integration test here INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ansible"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-asterisk"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-bup"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elasticsearch"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-etherpad_lite"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elastic_recheck"]="origin/master" diff --git a/modules/bup/files/etc/bup-excludes b/modules/bup/files/etc/bup-excludes deleted file mode 100644 index e9087a5e29..0000000000 --- a/modules/bup/files/etc/bup-excludes +++ /dev/null @@ -1,13 +0,0 @@ -/proc/* -/sys/* -/dev/* -/tmp/* -/floppy/* -/cdrom/* -/var/spool/squid/* -/var/spool/exim/* -/media/* -/mnt/* -/var/agentx/* -/run/* -/root/backup-restore-* diff --git a/modules/bup/manifests/init.pp b/modules/bup/manifests/init.pp deleted file mode 100644 index 8ff7555d10..0000000000 --- a/modules/bup/manifests/init.pp +++ /dev/null @@ -1,12 +0,0 @@ -# Class: bup -# -class bup { - package { 'bup': - ensure => present, - } - - file { '/etc/bup-excludes': - ensure => present, - source => 'puppet:///modules/bup/etc/bup-excludes', - } -} diff --git a/modules/bup/manifests/site.pp b/modules/bup/manifests/site.pp deleted file mode 100644 index 7218f874b4..0000000000 --- a/modules/bup/manifests/site.pp +++ /dev/null @@ -1,13 +0,0 @@ -# Define: bup::site -# -define bup::site( - $backup_user, - $backup_server -) { - cron { "bup-${name}": - user => 'root', - hour => '5', - minute => '37', - command => "tar -X /etc/bup-excludes -cPf - / | bup split -r ${backup_user}@${backup_server}: -n root -q", - } -}