From 6991905e52376b374ab19754db044d6b675b3882 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 10 Feb 2020 15:39:40 +1100
Subject: [PATCH] Migrate AFS publishing to mirror-update.opendev.org

This follows-on from I62ae941e70c7d58e00bc663a50d52e79dfa5a684 to
remove the old publishing job from the afs server and enable live
publishing in the cron job on mirror-update.opendev.org.

Change-Id: Ib6cc094e6f02b513c5218264657cec9064fe867c
---
 .../openstack_project/manifests/afsrelease.pp | 35 ++-----------------
 playbooks/roles/afs-release/tasks/main.yaml   |  4 +--
 2 files changed, 4 insertions(+), 35 deletions(-)

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'