Merge pull request #269 from rhafer/bsc969877-backport

Fix physnet mapping for non-vlan setups (bsc#969877)

chef/cookbooks/neutron/libraries/helpers.rb

@@ -29,11 +29,15 @@ def self.get_neutron_physnets(node, external_networks)
     end
 
     # Now check if any of the external network will share the physical interface
-    # with "nova_fixed".
-    fixed_conduit = node[:network][:networks][:nova_fixed][:conduit]
-    fixed_interface = BarclampLibrary::Barclamp::Inventory.lookup_interface_info(
-      node, fixed_conduit)[0]
-    fixed_physnet = "physnet1"
+    # with "nova_fixed" if the node has "nova_fixed" enabled.
+    fixed_interface = ""
+    fixed_physnet = ""
+    if node[:crowbar_wall][:network][:nets][:nova_fixed]
+      fixed_conduit = node[:network][:networks][:nova_fixed][:conduit]
+      fixed_interface = BarclampLibrary::Barclamp::Inventory.lookup_interface_info(
+        node, fixed_conduit)[0]
+      fixed_physnet = "physnet1"
+    end
 
     physmap = Hash.new
     networks.each do |net, values|