Merge lp:~ivoks/charm-helpers/multiple-origins into lp:charm-helpers

[Ante Karamatić]

Allow setting multiple sources for openstack-origin. By accepting this change, openstack-origin could be defined as:

quantum-gateway:
 openstack-origin: 'cloud:precise-havana/updates, ppa:ivoks/cool-neutron-ppa, ppa:joe/cool-openvswitch-ppa'

[Ante Karamatić (ivoks)]

Maybe a better approach would be to add additional 'additional-origins' or something, cause openstack-origin is used to guess the version of OpenStack that's being installed. That info is later on used to figure out stuff like Neutron or Quantum.

Unmerged revisions

107. By Ante Karamatić on 2013-12-11

Allow setting multiple sources for openstack-origin.

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2013-12-04 13:25:24 +0000
+++ charmhelpers/contrib/openstack/utils.py	2013-12-11 10:26:16 +0000
@@ -212,73 +212,79 @@
 
 def configure_installation_source(rel):
     '''Configure apt installation source.'''
-    if rel == 'distro':
-        return
-    elif rel == 'distro-proposed':
-        ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
-        with open('/etc/apt/sources.list.d/juju_deb.list', 'w') as f:
-            f.write(DISTRO_PROPOSED % ubuntu_rel)
-    elif rel[:4] == "ppa:":
-        src = rel
-        subprocess.check_call(["add-apt-repository", "-y", src])
-    elif rel[:3] == "deb":
-        l = len(rel.split('|'))
-        if l == 2:
-            src, key = rel.split('|')
-            juju_log("Importing PPA key from keyserver for %s" % src)
-            import_key(key)
-        elif l == 1:
-            src = rel
-        with open('/etc/apt/sources.list.d/juju_deb.list', 'w') as f:
-            f.write(src)
-    elif rel[:6] == 'cloud:':
-        ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
-        rel = rel.split(':')[1]
-        u_rel = rel.split('-')[0]
-        ca_rel = rel.split('-')[1]
-
-        if u_rel != ubuntu_rel:
-            e = 'Cannot install from Cloud Archive pocket %s on this Ubuntu '\
-                'version (%s)' % (ca_rel, ubuntu_rel)
-            error_out(e)
-
-        if 'staging' in ca_rel:
-            # staging is just a regular PPA.
-            os_rel = ca_rel.split('/')[0]
-            ppa = 'ppa:ubuntu-cloud-archive/%s-staging' % os_rel
-            cmd = 'add-apt-repository -y %s' % ppa
-            subprocess.check_call(cmd.split(' '))
+    list = rel.replace(", ", ",").split(",")
+    open('/etc/apt/sources.list.d/juju_deb.list', 'w').close()
+    for each in list:
+        if each == 'distro':
             return
-
-        # map charm config options to actual archive pockets.
-        pockets = {
-            'folsom': 'precise-updates/folsom',
-            'folsom/updates': 'precise-updates/folsom',
-            'folsom/proposed': 'precise-proposed/folsom',
-            'grizzly': 'precise-updates/grizzly',
-            'grizzly/updates': 'precise-updates/grizzly',
-            'grizzly/proposed': 'precise-proposed/grizzly',
-            'havana': 'precise-updates/havana',
-            'havana/updates': 'precise-updates/havana',
-            'havana/proposed': 'precise-proposed/havana',
-            'icehouse': 'precise-updates/icehouse',
-            'icehouse/updates': 'precise-updates/icehouse',
-            'icehouse/proposed': 'precise-proposed/icehouse',
-        }
-
-        try:
-            pocket = pockets[ca_rel]
-        except KeyError:
-            e = 'Invalid Cloud Archive release specified: %s' % rel
-            error_out(e)
-
-        src = "deb %s %s main" % (CLOUD_ARCHIVE_URL, pocket)
-        apt_install('ubuntu-cloud-keyring', fatal=True)
-
-        with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as f:
-            f.write(src)
-    else:
-        error_out("Invalid openstack-release specified: %s" % rel)
+        elif each == 'distro-proposed':
+            ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
+            with open('/etc/apt/sources.list.d/juju_deb.list', 'a') as f:
+                f.write(DISTRO_PROPOSED % ubuntu_rel)
+                f.write('\n')
+        elif each[:4] == "ppa:":
+            src = each
+            subprocess.check_call(["add-apt-repository", "-y", src])
+        elif each[:3] == "deb":
+            l = len(each.split('|'))
+            if l == 2:
+                src, key = each.split('|')
+                juju_log("Importing PPA key from keyserver for %s" % src)
+                import_key(key)
+            elif l == 1:
+                src = each
+            with open('/etc/apt/sources.list.d/juju_deb.list', 'a') as f:
+                f.write(src)
+                f.write('\n')
+        elif each[:6] == 'cloud:':
+            ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
+            each = each.split(':')[1]
+            u_rel = each.split('-')[0]
+            ca_rel = each.split('-')[1]
+    
+            if u_rel != ubuntu_rel:
+                e = 'Cannot install from Cloud Archive pocket %s on this Ubuntu '\
+                    'version (%s)' % (ca_rel, ubuntu_rel)
+                error_out(e)
+    
+            if 'staging' in ca_rel:
+                # staging is just a regular PPA.
+                os_rel = ca_rel.split('/')[0]
+                ppa = 'ppa:ubuntu-cloud-archive/%s-staging' % os_rel
+                cmd = 'add-apt-repository -y %s' % ppa
+                subprocess.check_call(cmd.split(' '))
+                return
+    
+            # map charm config options to actual archive pockets.
+            pockets = {
+                'folsom': 'precise-updates/folsom',
+                'folsom/updates': 'precise-updates/folsom',
+                'folsom/proposed': 'precise-proposed/folsom',
+                'grizzly': 'precise-updates/grizzly',
+                'grizzly/updates': 'precise-updates/grizzly',
+                'grizzly/proposed': 'precise-proposed/grizzly',
+                'havana': 'precise-updates/havana',
+                'havana/updates': 'precise-updates/havana',
+                'havana/proposed': 'precise-proposed/havana',
+                'icehouse': 'precise-updates/icehouse',
+                'icehouse/updates': 'precise-updates/icehouse',
+                'icehouse/proposed': 'precise-proposed/icehouse',
+            }
+    
+            try:
+                pocket = pockets[ca_rel]
+            except KeyError:
+                e = 'Invalid Cloud Archive release specified: %s' % each
+                error_out(e)
+    
+            src = "deb %s %s main" % (CLOUD_ARCHIVE_URL, pocket)
+            apt_install('ubuntu-cloud-keyring', fatal=True)
+    
+            with open('/etc/apt/sources.list.d/cloud-archive.list', 'a') as f:
+                f.write(src)
+                f.write('\n')
+        else:
+            error_out("Invalid openstack-release specified: %s" % each)
 
 
 def save_script_rc(script_path="scripts/scriptrc", **env_vars):