Merge lp:~1chb1n/charms/trusty/nova-cloud-controller/six-install into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Ryan Beisner]

Install python-six explicitly via the charm install hook
See tracking bug: bug 1403195
Also related SRU bug: bug 1403114

Will also eventually be fixed in keystone icehouse package deps.

[Ryan Beisner (1chb1n)]

FYI: deploy tests succeed for this charm, but neutron-gateway is the next in line to fail, having the old six installed.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #201 nova-cloud-controller-next for 1chb1n mp244911
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/201/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #230 nova-cloud-controller-next for 1chb1n mp244911
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/230/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #250 nova-cloud-controller-next for 1chb1n mp244911
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/250/

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-11-14 09:55:10 +0000
+++ hooks/nova_cc_utils.py	2014-12-16 20:23:06 +0000
@@ -67,6 +67,7 @@
     'python-mysqldb',
     'python-psycopg2',
     'python-psutil',
+    'python-six',
     'uuid',
 ]