Merge lp:~verterok/charms/trusty/conn-check/xenial-support into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

[Guillermo Gonzalez]

Install virtualenv package, only if release == xenial and fix inline checks @ variable definitions to work in xenial

- install virtualenv package, only if release == xenial
- fix inline checks @ variable definitions to work in xenial:
   something changed between trusty -> xenial and now it fails with errors like:
TASK [nrpe-external-master : Call charmhelpers nrpe support] *******************
fatal: [localhost]: FAILED! => {"failed": true, "msg": "ERROR! ERROR! ERROR! list object has no element 0"}

[Simon Davy (bloodearnest)]

review: Approve

=== modified file 'playbook.yaml'
--- playbook.yaml	2016-04-26 10:26:04 +0000
+++ playbook.yaml	2016-12-20 13:58:40 +0000
@@ -3,11 +3,11 @@
   vars:
     env_dir: /srv/conn-check/virtualenvs
     wheels_dir: /srv/conn-check/wheels-exports
-    config_path: "{{ relations['conn-check'][0]['config_path'] | default('/srv/conn-check/config.yaml') }}"
-    config_provided: "{{ 'config' in relations['conn-check'][0] | default(dict()) }}"
-    path_provided: "{{ 'config_path' in relations['conn-check'][0] | default(dict()) }}"
-    config_or_path_provided: "{{ relations['conn-check'][0] | default([]) | intersect(['config', 'config_path']) | length > 0 }}"
-    nagios_enabled: "{{ 'nagios_host_context' in relations['nrpe-external-master'][0] | default({}) }}"
+    config_path: "{{ relations['conn-check'][0]['config_path'] if relations['conn-check'] else None | default('/srv/conn-check/config.yaml') }}"
+    config_provided: "{{ 'config' in relations['conn-check'][0] if relations['conn-check'] else None | default(dict()) }}"
+    path_provided: "{{ 'config_path' in relations['conn-check'][0] if relations['conn-check'] else None | default(dict()) }}"
+    config_or_path_provided: "{{ relations['conn-check'][0] if relations['conn-check'] else [] | default([]) | intersect(['config', 'config_path']) | length > 0 }}"
+    nagios_enabled: "{{ 'nrpe-external-master' in relations and 'nagios_host_context' in relations['nrpe-external-master'][0] | default({}) }}"
     wheels_url: http://bazaar.launchpad.net/~ubuntuone-hackers/conn-check/wheels
     current_dir: "{{ env_dir }}/{{ revision }}"
     bin_path: "{{ current_dir }}/bin/conn-check"
@@ -34,6 +34,15 @@
         - python-pip
         - python-virtualenv
 
+    - name: install packages (only xenial)
+      tags:
+        - install
+        - upgrade-charm
+      apt: pkg={{ item }}
+      with_items:
+        - virtualenv
+      when: ansible_distribution_release == "xenial"
+
     - name: create dirs
       tags:
         - install