diff --git a/modules/openstack_project/manifests/afsrelease.pp b/modules/openstack_project/manifests/afsrelease.pp index 39a403c482..b89417457b 100644 --- a/modules/openstack_project/manifests/afsrelease.pp +++ b/modules/openstack_project/manifests/afsrelease.pp @@ -1,44 +1,15 @@ # Release afs volumes class openstack_project::afsrelease ( ) { - include logrotate - - file { '/usr/local/bin/release-volumes': - ensure => present, - owner => 'root', - group => 'root', - mode => '0755', - source => 'puppet:///modules/openstack_project/openafs/release-volumes.py', - } - - file { '/var/log/release': - ensure => directory, - owner => 'root', - group => 'root', - mode => '0755', - } + # NOTE(ianw) 2020-02 : migrated to mirror-update and deployed via ansible now + # https://review.opendev.org/706176 cron { 'release': user => 'root', minute => '*/5', command => '/usr/local/bin/release-volumes >>/var/log/release/release.log 2>&1', environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', - require => [ - File['/usr/local/bin/release-volumes'], - ] + ensure => absent, } - logrotate::file { 'release': - ensure => present, - log => '/var/log/release/release.log', - options => ['compress', - 'copytruncate', - 'delaycompress', - 'missingok', - 'rotate 7', - 'daily', - 'notifempty', - ], - require => Cron['release'], - } } diff --git a/playbooks/roles/afs-release/tasks/main.yaml b/playbooks/roles/afs-release/tasks/main.yaml index a25353f6b9..dc4c1c35ce 100644 --- a/playbooks/roles/afs-release/tasks/main.yaml +++ b/playbooks/roles/afs-release/tasks/main.yaml @@ -31,9 +31,7 @@ cron: name: 'Release afs volumes' state: present - # NOTE(ianw) : for initial testing purposes while we migrate, - # don't actually release - job: '/opt/afs-release/release-volumes.py -d --skip-release >> /var/log/afs-release/afs-release.log 2>&1' + job: '/opt/afs-release/release-volumes.py -d >> /var/log/afs-release/afs-release.log 2>&1' hour: '*' minute: '*/5'