Merge "Fix nova-network settings in multi_host mode"

manifests/all.pp

@@ -456,7 +456,6 @@ class openstack::all (
       }
     } else {
       nova_config {
-        'DEFAULT/multi_host':      value => false;
         'DEFAULT/send_arp_for_ha': value => false;
       }
     }

manifests/nova/controller.pp

@@ -176,8 +176,9 @@ class openstack::nova::controller (
     # Configure nova-network
     if $multi_host {
       nova_config { 'DEFAULT/multi_host': value => true }
-      $enable_network_service = false
+      $enable_network_service = true
     } else {
+      nova_config { 'DEFAULT/multi_host': value => false }
       if $enabled {
         $enable_network_service = true
       } else {

spec/classes/openstack_controller_spec.rb

@@ -692,8 +692,8 @@ describe 'openstack::controller' do
         it { should contain_nova_config('DEFAULT/multi_host').with(:value => true)}
         it {should contain_class('nova::network').with(
           :create_networks   => true,
-          :enabled           => false,
-          :install_service   => false
+          :enabled           => true,
+          :install_service   => true
         )}
       end