XXX

chef/cookbooks/neutron/recipes/common_agent.rb

@@ -214,14 +214,21 @@
        )
     end
   when ml2_mech_drivers.include?("zvm")
+
+    vlan_start = neutron[:network][:networks][:nova_fixed][:vlan]
+    num_vlans = neutron[:neutron][:num_vlans]
+    vlan_end = [vlan_start + num_vlans - 1, 4094].min
+
     template agent_config_path do
       cookbook "neutron"
       source "neutron_zvm_plugin.ini.erb"
       owner "root"
       group node[:neutron][:platform][:group]
       mode "0640"
       variables(
-        zvm: neutron[:neutron][:zvm]
+        zvm: neutron[:neutron][:zvm],
+        vlan_start: vlan_start,
+        vlan_end: vlan_end,
       )
     end
   end

chef/cookbooks/neutron/recipes/server.rb

@@ -160,6 +160,11 @@
   # on whether one of the external networks will share the physical interface
   # with "nova_fixed".
   external_networks = ["nova_floating"]
+
+  # XXX define the xcat management network when needed
+  if true
+    external_networks += ["xcatvsw1"]
+  end
   external_networks.concat(node[:neutron][:additional_external_networks])
   network_node = NeutronHelper.get_network_node_from_neutron_attributes(node)
   physnet_map = NeutronHelper.get_neutron_physnets(network_node, external_networks)
@@ -170,7 +175,7 @@
   #TODO(vuntz): temporarily disable the hyperv mechanism since we're lacking networking-hyperv from stackforge
   #ml2_mechanism_drivers = node[:neutron][:ml2_mechanism_drivers].dup.push("hyperv")
   ml2_mechanism_drivers = node[:neutron][:ml2_mechanism_drivers].dup
-  ml2_mechanism_drivers = ["zvm"]
+  ml2_mechanism_drivers.push("zvm")
   if ml2_type_drivers.include?("gre") || ml2_type_drivers.include?("vxlan")
     ml2_mechanism_drivers.push("l2population")
     mtu_value = 1400

chef/cookbooks/neutron/templates/default/neutron_zvm_plugin.ini.erb

@@ -34,10 +34,23 @@ zvm_xcat_server = <%= @zvm[:zvm_xcat_server] %>
 # (StrOpt ) xcat management NIC IP.
 # xcat_mgt_ip = 10.1.0.1
 # Example: xcat_mgt_ip=10.1.0.1
+# xcat_mgt_ip = <%= @zvm[:xcat_mgt_ip] %>
 
 # (StrOpt ) xcat management NIC mask.
 # xcat_mgt_mask=255.255.0.0
 # Example: xcat_mgt_mask=255.255.0.0
+# xcat_mgt_mask = <%= @zvm[:xcat_mgt_mask] %>
+
+[ml2_type_vlan]
+network_vlan_ranges = physnet1:<%= @vlan_start %>:<%= @vlan_end %>
+
+# XXX only if xcat_mgmt_ip is defined
+[ml2_type_flat]
+flat_networks = xcatvsw1
+
+[physnet1]
+# rdev_list = 609, 809
+rdev_list = 609
 
 # (StrOpt ) rdev_list for each vswitch's uplink real device(s), seperated by ','.
 # If a vswitch does not connect an OSA, which means it does not connect to