Merge lp:~cjohnston/charm-helpers/1324055 into lp:charm-helpers

[Chris Johnston]

Add the ability for a user to provide a custom location for installing ansible.

Some teams would like to be able to use a PPA that they control for installing ansible.

[lp:~cjohnston/charm-helpers/1324055]

154. By Chris Johnston on 2014-05-28

Add support for providing a custom ansible install location

[Michael Nelson (michael.nelson)]

12:53 <cjohnston> could you look at https://code.launchpad.net/~cjohnston/charm-helpers/1324055/+merge/221217 please :-)
12:54 <noodles> Sure, if you can answer a few questions about it :-)
12:54 <cjohnston> ok
12:54 <noodles> So, the main question I've got, why would you want to deploy using a PPA at all?
12:55 <noodles> (sorry, that's not meant to sound tardy, let me rephrase)
12:55 <cjohnston> because we deploy to HP
12:55 <cjohnston> which doesn't have access to -cat
12:55 <noodles> Ah. k.
12:56 <cjohnston> anything else
12:56 <cjohnston> ?
12:57 <noodles> Not really. You know that if you deploy to trusty you won't need a ppa at all right? (as 1.5.4 is in trusty universe)
12:57 * noodles adds +1

review: Approve

=== modified file 'charmhelpers/contrib/ansible/__init__.py'
--- charmhelpers/contrib/ansible/__init__.py	2013-11-20 14:19:58 +0000
+++ charmhelpers/contrib/ansible/__init__.py	2014-05-28 12:48:47 +0000
@@ -75,20 +75,20 @@
 ansible_vars_path = '/etc/ansible/host_vars/localhost'
 
 
-def install_ansible_support(from_ppa=True):
+def install_ansible_support(from_ppa=True, ppa_location='ppa:rquillo/ansible'):
     """Installs the ansible package.
 
     By default it is installed from the PPA [1] linked from
-    the ansible website [2].
+    the ansible website [2] or from a ppa specified by a charm config.
 
     [1] https://launchpad.net/~rquillo/+archive/ansible
     [2] http://www.ansibleworks.com/docs/gettingstarted.html#ubuntu-and-debian
 
-    If from_ppa is false, you must ensure that the package is available
+    If from_ppa is empty, you must ensure that the package is available
     from a configured repository.
     """
     if from_ppa:
-        charmhelpers.fetch.add_source('ppa:rquillo/ansible')
+        charmhelpers.fetch.add_source(ppa_location)
         charmhelpers.fetch.apt_update(fatal=True)
     charmhelpers.fetch.apt_install('ansible')
     with open(ansible_hosts_path, 'w+') as hosts_file: