Merge "VPP version update"

1 files changed, 23 insertions, 5 deletions

diff --git a/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp b/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp
index 26548d3a..cf8fe178 100644
--- a/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp
+++ b/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp
@@ -10,13 +10,28 @@
 # property for a package resource type.
 # Defaults to 'present'
 #
-# [*agents*]
-# Networking-vpp agents's addresses
-# Defaults to $::os_service_default
+# [*etcd_host*]
+# (required) etcd server host name or IP.
+# Defaults to '127.0.0.1'
+#
+# [*etcd_port*]
+# (optional) etcd server listening port.
+# Defaults to 4001.
+#
+# [*etcd_user*]
+# (optional) User name for etcd authentication
+# Defaults to ''.
+#
+# [*etcd_pass*]
+# (optional) Password for etcd authentication
+# Defaults to ''.
 #
 class neutron::plugins::ml2::networking-vpp (
   $package_ensure  = 'present',
-  $agents          = $::os_service_default,
+  $etcd_host       = '127.0.0.1',
+  $etcd_port       = 4001,
+  $etcd_user       = '',
+  $etcd_pass       = '',
 ) {
   require ::neutron::plugins::ml2
 
@@ -28,6 +43,9 @@ class neutron::plugins::ml2::networking-vpp (
   )
 
   neutron_plugin_ml2 {
-    'ml2_vpp/agents': value => $agents;
+    'ml2_vpp/etcd_host': value => $etcd_host;
+    'ml2_vpp/etcd_port': value => $etcd_port;
+    'ml2_vpp/etcd_user': value => $etcd_user;
+    'ml2_vpp/etcd_pass': value => $etcd_pass;
   }
 }