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

[Ante Karamatić]

Allow adding multiple sources to an instance. By accepting this change, openstack-origin stays untouched, but new config option can be used in a charm, that would utilize new functionality in configure_installation_source(). Something like:

quantum-gateway:
 openstack-origin: 'cloud:precise-havana/updates'
 added-sources: '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.

[James Page (james-page)]

OK _ so how about we add 'source:' to the charms like alot of other ones do and then just use the standard fetch helper to handle that parameter which already deals with having multiple sources to add?

        source:
          - "ppa:foo"
          - "http://example.com/repo precise main"
        keys:
          - null
          - "a1b2c3d4"

see charmhelpers/fetch/__init__.py (configure_sources)

review: Needs Information

Unmerged revisions

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

Allow adding additional archives to the instance

=== 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 16:53:32 +0000
@@ -209,15 +209,19 @@
     except subprocess.CalledProcessError:
         error_out("Error importing repo key %s" % keyid)
 
-
-def configure_installation_source(rel):
-    '''Configure apt installation source.'''
+def write_sources_file(rel, owerwrite=True):
+    '''Write actuall sources file(s)'''
+    if owerwrite == True:
+        mode = 'w'
+    else:
+        mode = 'a'
     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:
+        with open('/etc/apt/sources.list.d/juju_deb.list', mode) as f:
             f.write(DISTRO_PROPOSED % ubuntu_rel)
+            f.write('\n')
     elif rel[:4] == "ppa:":
         src = rel
         subprocess.check_call(["add-apt-repository", "-y", src])
@@ -229,8 +233,9 @@
             import_key(key)
         elif l == 1:
             src = rel
-        with open('/etc/apt/sources.list.d/juju_deb.list', 'w') as f:
+        with open('/etc/apt/sources.list.d/juju_deb.list', mode) as f:
             f.write(src)
+            f.write('\n')
     elif rel[:6] == 'cloud:':
         ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
         rel = rel.split(':')[1]
@@ -275,12 +280,24 @@
         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:
+        with open('/etc/apt/sources.list.d/cloud-archive.list', mode) as f:
             f.write(src)
+            f.write('\n')
     else:
         error_out("Invalid openstack-release specified: %s" % rel)
 
 
+def configure_installation_source(rel, added=None):
+    '''Configure apt installation source.'''
+    if rel:
+        write_sources_file(rel)
+    if added:
+        sources = added.split(",")
+        sources = [s.strip() for s in sources]
+        for s in sources:
+            write_sources_file(s, False)
+
+
 def save_script_rc(script_path="scripts/scriptrc", **env_vars):
     """
     Write an rc file in the charm-delivered directory containing