Merge lp:~michael.nelson/charms/trusty/conn-check/optional-ppa into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

[Michael Nelson]

Add install_ansible_from_ppa config option, defaulting to true for current behaviour, but allowing users to opt out of adding a PPA to their units.

Tested on an internal deployment.

[Kelvin Li (kelvin.li)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-11-14 10:30:58 +0000
+++ config.yaml	2015-05-22 03:24:07 +0000
@@ -7,3 +7,10 @@
         type: string
         default: ""
         description: "Extra command line arguments to pass to conn-check."
+    install_ansible_from_ppa:
+        type: boolean
+        default: true
+        description: |
+            Indicates whether ansible should be installed via the ppa. If this
+            is set to false you must ensure a compatable version of ansible
+            is installable via the configured apt repositories.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-03-06 17:01:23 +0000
+++ hooks/hooks.py	2015-05-22 03:24:07 +0000
@@ -2,6 +2,8 @@
 import sys
 import charmhelpers.contrib.ansible
 import charmhelpers.payload.execd
+import charmhelpers.core.hookenv
+
 
 hooks = charmhelpers.contrib.ansible.AnsibleHooks(
     playbook_path='playbook.yaml',
@@ -22,7 +24,9 @@
     executed.
     """
     charmhelpers.payload.execd.execd_preinstall()
-    charmhelpers.contrib.ansible.install_ansible_support(from_ppa=True)
+    config = charmhelpers.core.hookenv.config()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=config['install_ansible_from_ppa'])
 
 
 @hooks.action()