From 28441dd7953cc7a45cde24eb488da23b75a96f3a Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Mon, 18 Sep 2017 23:41:10 -0400 Subject: Add timeout for VPP interface command We need to have a time out before trying to create VPP tap interfaces. Change-Id: I9954240529278e74d93fdf89d2ebc2536249245a Signed-off-by: Feng Pan (cherry picked from commit 82b874e3f46b4a4b0b1e059135d5f05c9ac4c3f0) --- manifests/profile/base/neutron/opendaylight.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/profile/base/neutron') diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp index a766b1a..6eb56de 100644 --- a/manifests/profile/base/neutron/opendaylight.pp +++ b/manifests/profile/base/neutron/opendaylight.pp @@ -35,7 +35,7 @@ class tripleo::profile::base::neutron::opendaylight ( $odl_api_ips = hiera('opendaylight_api_node_ips'), $node_name = hiera('bootstack_nodeid') ) { - if hiera('vpp_enabled', false) and ('odl-router_v2' in hiera('neutron::service_plugins', [])) { + if hiera('vpp_enabled', false) and ('odl-lispflowmapping-msmr' in hiera('opendaylight::extra_features', [])) { file { 'org.opendaylight.groupbasedpolicy.renderer.vpp.startup.cfg': ensure => file, path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.renderer.vpp.startup.cfg', -- cgit 1.2.3-korg