From 412b07f4f621dfc4881fbd2105ab82d7dd7a98be Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Mon, 26 Sep 2016 14:39:23 -0400 Subject: VPP version update - Update VPP version to latest on 16.09 branch - Change networking-vpp repo to point to openstack. - Update VPP python API rpm location - Configure etcd for networking-vpp ML2 plugin opnfv-tht-pr: 85 JIRA: APEX-283 Change-Id: I4e69de3c51b1f4221995cc8568cdfa18aacbc55c Signed-off-by: Feng Pan --- .../manifests/plugins/ml2/networking-vpp.pp | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'build/puppet-neutron/manifests/plugins/ml2') 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; } } -- cgit 1.2.3-korg