Merge pull request #305 from sseago/vxlan-gre

limit ovs_tunnel_types to selected network tenant

app/lib/staypuft/seeder.rb

@@ -236,7 +236,7 @@ def functional_dependencies
       ml2_tenant_network_types    = [ tenant_network_type ]
       ml2_tunnel_id_ranges        = ['10:1000']
       ml2_vni_ranges              = ['10:1000']
-      ovs_tunnel_types            = ['vxlan', 'gre']
+      ovs_tunnel_types            = { :array =>  '<%= @host.deployment.neutron.ovs_tunnel_types %>' }
       ovs_tunnel_iface            = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.tenant_iface(@host) : "" %>' }
       ovs_bridge_mappings         = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_mappings(@host) %>' }
       ovs_bridge_uplinks          = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_uplinks(@host) %>' }

app/models/staypuft/deployment/neutron_service.rb

@@ -41,7 +41,7 @@ class NeutronVlanRangesValidator < ActiveModel::EachValidator
     class Jail < Safemode::Jail
       allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
         :tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
-        :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks
+        :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks, :ovs_tunnel_types
     end
 
     def set_defaults
@@ -98,6 +98,17 @@ def external_interface_name(host)
       deployment.network_query.interface_for_host(host, Staypuft::SubnetType::EXTERNAL)
     end
 
+    def ovs_tunnel_types
+      case network_segmentation
+      when NetworkSegmentation::VXLAN
+        ['vxlan']
+      when NetworkSegmentation::GRE
+        ['gre']
+      else
+        []
+      end
+    end
+
     def param_hash
       { 'network_segmentation'       => network_segmentation,
         'tenant_vlan_ranges'         => tenant_vlan_ranges }