diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
index b94359353..3c8a27f9d 100644
--- a/manifests/plugins/ml2.pp
+++ b/manifests/plugins/ml2.pp
@@ -26,7 +26,7 @@
 #   (optional) List of network type driver entrypoints to be loaded
 #   from the neutron.ml2.type_drivers namespace.
 #   Could be an array that can have these elements:
-#   local, flat, vlan, gre, vxlan
+#   local, flat, vlan, gre, vxlan, geneve
 #   Defaults to ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'].
 #
 # [*extension_drivers*]
@@ -135,7 +135,7 @@
 #   Defaults to undef
 #
 class neutron::plugins::ml2 (
-  $type_drivers              = ['local', 'flat', 'vlan', 'gre', 'vxlan'],
+  $type_drivers              = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
   $extension_drivers         = $::os_service_default,
   $tenant_network_types      = ['local', 'flat', 'vlan', 'gre', 'vxlan'],
   $mechanism_drivers         = ['openvswitch', 'linuxbridge'],
diff --git a/manifests/plugins/ml2/type_driver.pp b/manifests/plugins/ml2/type_driver.pp
index b15869590..2c09cc895 100644
--- a/manifests/plugins/ml2/type_driver.pp
+++ b/manifests/plugins/ml2/type_driver.pp
@@ -125,7 +125,7 @@ define neutron::plugins::ml2::type_driver (
     }
     neutron_plugin_ml2 {
       'ml2_type_geneve/max_header_size': value => $max_header_size;
-      'ml2_type_geneve/vni_ranges':      value => join($vni_ranges,',');
+      'ml2_type_geneve/vni_ranges':      value => join(any2array($vni_ranges),',');
     }
   }
   else {
diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb
index c4278d565..a9435f79b 100644
--- a/spec/classes/neutron_plugins_ml2_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_spec.rb
@@ -29,7 +29,7 @@ describe 'neutron::plugins::ml2' do
   end
 
   let :default_params do
-    { :type_drivers          => ['local', 'flat', 'vlan', 'gre', 'vxlan'],
+    { :type_drivers          => ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
       :tenant_network_types  => ['local', 'flat', 'vlan', 'gre', 'vxlan'],
       :mechanism_drivers     => ['openvswitch', 'linuxbridge'],
       :flat_networks         => '*',