Merge lp:~mthaddon/charms/trusty/glance-simplestreams-sync/run-parts-file-extensions into lp:charms/trusty/glance-simplestreams-sync

[Tom Haddon]

By default the "frequency" option is set to "daily". The charm then installs /usr/share/glance-simplestreams-sync/glance-simplestreams-sync.py and creates a symlink to it in /etc/cron.daily. "run-parts" silently ignores any scripts with a dot in the name [1], so this never gets run. Update the charm to remove that file extension.

Note that this will fix newly installed charms, but won't fix existing versions. Let me know if you'd like that changed, as it will mean carrying some "cruft" in the charm for a while to remove the .py version of the file.

[1] http://man.cx/run-parts%288%29 "the Debian cron script namespace (^[a−z0−9][a−z0−9−]*$)"

Also, fix the default arch filter for the mirror_list config variable to actually work.

[lp:~mthaddon/charms/trusty/glance-simplestreams-sync/run-parts-file-extensions]

53. By Tom Haddon on 2014-09-26

Fix the default arch filter for the mirror_list config variable to actually work

[Scott Moser (smoser)]

looks good to me.

[Mike McCracken (mikemc)]

Unfortunately these were already fixed in lp:glance-simplestreams-sync, but not yet merged into the charms branch:

fix for cron job naming (and other bugs regarding changing config values on a running charm):
http://bazaar.launchpad.net/~cloud-installer/glance-simplestreams-sync-charm/trunk/revision/52

fix for typo in default arch filter: http://bazaar.launchpad.net/~cloud-installer/glance-simplestreams-sync-charm/trunk/revision/53

I will propose the updated charm ASAP. My apologies for the duplicate effort.

review: Disapprove

[Mike McCracken (mikemc)]

oops, lp:glance-simplestreams-sync should be lp:glance-simplestreams-sync-charm - that's the LP project.

Currently the active development of the code is on github here: https://github.com/Ubuntu-Solutions-Engineering/glance-simplestreams-sync-charm

The LP project is just an import of the 'master' branch of that repo.

[Mike McCracken (mikemc)]

FYI, the MP for pulling in the updates from github is here:
https://code.launchpad.net/~mikemc/charms/trusty/glance-simplestreams-sync/trunk/+merge/236189

[James Page (james-page)]

github code already merged so marking this as merged as well

=== modified file 'config.yaml'
--- config.yaml	2014-06-18 18:43:42 +0000
+++ config.yaml	2014-09-26 16:40:26 +0000
@@ -4,7 +4,7 @@
     default: "[{url: 'http://cloud-images.ubuntu.com/releases/',
                 name_prefix: 'ubuntu:released',
                 path: 'streams/v1/index.sjson', max: 1,
-                item_filters: ['release=trusty', 'arch=(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]"
+                item_filters: ['release=trusty', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]"
     description: >
       YAML-formatted list of simplestreams mirrors and their configuration
       properties. Defaults to downloading the released images from
@@ -28,4 +28,4 @@
   cloud_name:
     type: string
     default: "glance-simplestreams-sync-openstack"
-    description: "Cloud name to be used in simplestreams index file"
\ No newline at end of file
+    description: "Cloud name to be used in simplestreams index file"

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-06-18 18:15:29 +0000
+++ hooks/hooks.py	2014-09-26 16:40:26 +0000
@@ -40,7 +40,7 @@
 MIRRORS_CONF_FILE_NAME = os.path.join(CONF_FILE_DIR, 'mirrors.yaml')
 ID_CONF_FILE_NAME = os.path.join(CONF_FILE_DIR, 'identity.yaml')
 
-SCRIPT_NAME = "glance-simplestreams-sync.py"
+SCRIPT_NAME = "glance-simplestreams-sync"
 
 CRON_POLL_FILENAME = 'glance_simplestreams_sync_fastpoll'
 CRON_POLL_FILEPATH = os.path.join('/etc/cron.d', CRON_POLL_FILENAME)