Merge lp:~paulgear/ubuntu-repository-cache/is-recent-updates into lp:~tribaal/ubuntu-repository-cache/trunk

[Paul Gear]

This includes recent IS changes in the hope that we'll be able to switch to the trunk branch shortly. The 'run-one' changes may not be necessary if you've taken other steps to ensure that cron runs do not overlap.

[Chris Glass (tribaal)]

This looks good!

Merged.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2017-03-20 20:03:32 +0000
+++ config.yaml	2017-10-09 01:50:47 +0000
@@ -9,7 +9,7 @@
     default: ""
     type: string
     description: |
-      A space seperated list of ubuntu series metadata to mirror. An empty
+      A space-separated list of ubuntu series metadata to mirror. An empty
       or blank string will mirror everything.
   sync-on-start:
     default: true

=== modified file 'hooks/install'
--- hooks/install	2017-03-24 15:47:12 +0000
+++ hooks/install	2017-10-09 01:50:47 +0000
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # Install pre-install-hook dependencies (basically anything charmhelpers needs)
-apt-get install -y python3-yaml python3-six python3-jinja2
+apt-get install -y python3-yaml python3-six python3-jinja2 run-one
 
 # Install the vendored python packages.
 pushd .

=== modified file 'lib/charmhelpers/core/host.py'
--- lib/charmhelpers/core/host.py	2016-12-13 04:02:35 +0000
+++ lib/charmhelpers/core/host.py	2017-10-09 01:50:47 +0000
@@ -177,6 +177,8 @@
 
 def init_is_systemd():
     """Return True if the host system uses systemd, False otherwise."""
+    if lsb_release()['DISTRIB_CODENAME'] == 'trusty':
+        return False
     return os.path.isdir(SYSTEMD_SYSTEM)
 
 

=== modified file 'templates/cron/ubuntu-repository-cache_rsync.cron'
--- templates/cron/ubuntu-repository-cache_rsync.cron	2017-08-22 08:22:27 +0000
+++ templates/cron/ubuntu-repository-cache_rsync.cron	2017-10-09 01:50:47 +0000
@@ -7,5 +7,5 @@
 MIRROR_SERIES="{{ MirrorSeries }}"
 # This cronjob will make the leader sync its view of the metadata with upstream
 # It will then trigger a juju-run to let its peers synchronise.
-{{ Minutes }} * * * * root python3 -m ubuntu_repository_cache.metadata_sync
+{{ Minutes }} * * * * root run-one python3 -m ubuntu_repository_cache.metadata_sync