Merge lp:~james-page/charms/quantal/ceph-radosgw/trunk into lp:~charmers/charms/quantal/ceph-radosgw/trunk

[James Page]

Support use of cloud: prefix to pull ceph from the Ubuntu cloud archive.

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Ahh ... missed the fact that this is a quantal charm...

It'll be a minute or two longer while I set up my environment for this.

-Juan

[Juan L. Negron (negronjl)]

This looks good to me.

Approved.

I'll merge it in a few minutes.

-Juan

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2012-10-09 15:14:23 +0000
+++ config.yaml	2012-11-12 10:11:22 +0000
@@ -5,7 +5,7 @@
       Optional configuration to support use of additional sources such as:
       .
         - ppa:myteam/ppa
-        - cloud:folsom-proposed
+        - cloud:precise-proposed/folsom
         - http://my.archive.com/ubuntu main
       .
       The last option should be used in conjunction with the key configuration

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2012-10-08 15:58:16 +0000
+++ hooks/utils.py	2012-11-12 10:11:22 +0000
@@ -51,24 +51,38 @@
     return template.render(context)
 
 
+CLOUD_ARCHIVE = \
+""" # Ubuntu Cloud Archive
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu {} main
+"""
+
+
 def configure_source():
-    source = config_get('source')
-    if (source.startswith('ppa:') or
-        source.startswith('cloud:') or
-        source.startswith('http:')):
+    source = str(config_get('source'))
+    if not source:
+        return
+    if source.startswith('ppa:'):
         cmd = [
             'add-apt-repository',
             source
             ]
         subprocess.check_call(cmd)
+    if source.startswith('cloud:'):
+        install('ubuntu-cloud-keyring')
+        pocket = source.split(':')[1]
+        with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as apt:
+            apt.write(CLOUD_ARCHIVE.format(pocket))
     if source.startswith('http:'):
+        with open('/etc/apt/sources.list.d/quantum.list', 'w') as apt:
+            apt.write("deb " + source + "\n")
         key = config_get('key')
-        cmd = [
-            'apt-key',
-            'import',
-            key
-            ]
-        subprocess.check_call(cmd)
+        if key:
+            cmd = [
+                'apt-key',
+                'adv', '--keyserver keyserver.ubuntu.com',
+                '--recv-keys', key
+                ]
+            subprocess.check_call(cmd)
     cmd = [
         'apt-get',
         'update'