Merge lp:~corey.bryant/charms/trusty/neutron-gateway/proxy-none into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Corey Bryant]

See the following charm-helpers mp for an explanation of this fix: https://code.launchpad.net/~corey.bryant/charm-helpers/proxy-none/+merge/262885

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

charm_lint_check #5597 neutron-gateway-next for corey.bryant mp262892
    LINT OK: passed

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

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

charm_unit_test #5229 neutron-gateway-next for corey.bryant mp262892
    UNIT OK: passed

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

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

charm_amulet_test #4765 neutron-gateway-next for corey.bryant mp262892
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11774135/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4765/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/charmhelpers/contrib/python/packages.py'
--- hooks/charmhelpers/contrib/python/packages.py	2015-05-07 18:54:35 +0000
+++ hooks/charmhelpers/contrib/python/packages.py	2015-06-24 19:18:18 +0000
@@ -36,6 +36,8 @@
 def parse_options(given, available):
     """Given a set of options, check if available"""
     for key, value in sorted(given.items()):
+        if not value:
+            continue
         if key in available:
             yield "--{0}={1}".format(key, value)