Merge "Trap for stale packages and purge them"

modules/openstack_project/files/run_bandersnatch.py

@@ -0,0 +1,50 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import requests
+import subprocess
+
+
+def setup_logging(logger):
+    ch = logging.StreamHandler()
+    formatter = logging.Formatter(
+        '%(asctime)s %(levelname)s: %(message)s')
+    ch.setFormatter(formatter)
+    logger.setLevel(logging.INFO)
+    logger.addHandler(ch)
+
+
+def main():
+    logger = logging.getLogger('bandersnatch')
+    setup_logging(logger)
+
+    stale = dict()
+    output = subprocess.check_output(
+        ['bandersnatch', 'mirror'], stderr=subprocess.STDOUT)
+    for line in output.split('\n'):
+        print(line)
+        if 'Expected PyPI serial' in line:
+            url = line.split("for request ")[1].split()[0]
+            stale[url] = True
+    for url in stale.keys():
+        logger.info('Purging %s' % url)
+        response = requests.request('PURGE', url)
+        if not response.ok:
+            logger.error('Failed to purge %s: %s' % (url, response.text))
+
+
+if __name__ == '__main__':
+    main()

modules/openstack_project/manifests/static.pp

@@ -249,7 +249,7 @@ class openstack_project::static (
 
   cron { 'bandersnatch':
     minute      => '*/5',
-    command     => 'bandersnatch mirror >>/var/log/bandersnatch/mirror.log 2>&1',
+    command     => 'run-bandersnatch >>/var/log/bandersnatch/mirror.log 2>&1',
     environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
   }
 
@@ -265,4 +265,13 @@ class openstack_project::static (
       'notifempty',
     ],
   }
+
+  file { '/usr/local/bin/run-bandersnatch':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+    source  => 'puppet:///modules/openstack_project/run_bandersnatch.py',
+  }
+
 }