Merge lp:~mikemc/charms/trusty/glance-simplestreams-sync/add-source-config into lp:charms/trusty/glance-simplestreams-sync

[Mike McCracken]

Add 'source' and 'key' config options to support adding a PPA source for packages installed by the charm.

Add 'source' and 'key' config options to support adding a PPA source for packages installed by the charm.

This is potentially generally useful but is motivated by wanting the cloud-installer/simplestreams-testing PPA on trusty. That PPA had been unconditionally installed, but that was causing issues and will be removed by this branch: https://code.launchpad.net/~freyes/charms/trusty/glance-simplestreams-sync/lp1522929/+merge/279644

This option allows us to add that PPA only when required.

[Marco Ceppi (marcoceppi)]

lgtm

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-09-08 16:25:57 +0000
+++ config.yaml	2016-01-15 20:02:49 +0000
@@ -78,3 +78,21 @@
     description: |
       A comma-separated list of nagios servicegroups.
       If left empty, the nagios_context will be used as the servicegroup
+  source:
+    type: string
+    default:
+    description: |
+      Optional configuration to support use of additional sources such as:
+       
+        - ppa:myteam/ppa
+        - cloud:trusty-proposed/kilo
+        - http://my.archive.com/ubuntu main
+
+        The last option should be used in conjunction with the key configuration
+        option.
+  key:
+    type: string
+    default:
+    description: |
+      Key ID to import to the apt keyring to support use with arbitary source
+      configuration from outside of Launchpad archives or PPA's.
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-01-15 20:02:49 +0000
+++ hooks/hooks.py	2016-01-15 20:02:49 +0000
@@ -195,6 +195,7 @@
 @hooks.hook('install')
 def install():
     execd_preinstall()
+    add_source(hookenv.config('source'), hookenv.config('key'))
     for directory in [CONF_FILE_DIR, USR_SHARE_DIR]:
         hookenv.log("creating config dir at {}".format(directory))
         if not os.path.isdir(directory):