Merge lp:~james-page/charms/trusty/nova-compute/nsx-update into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[James Page]

Fixup NSX support for Icehouse

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'charm-helpers.yaml'
--- charm-helpers.yaml	2014-03-27 11:08:20 +0000
+++ charm-helpers.yaml	2014-06-17 09:57:55 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-04-16 08:26:38 +0000
+++ templates/havana/nova.conf	2014-06-17 09:57:55 +0000
@@ -48,7 +48,7 @@
 {% endif -%}
 {% endif -%}
 
-{% if neutron_plugin and neutron_plugin == 'nvp' -%}
+{% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
 security_group_api = neutron
 firewall_driver = nova.virt.firewall.NoopFirewallDriver