diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-09-18 23:41:10 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-09-29 05:08:39 +0000 |
| commit | 28441dd7953cc7a45cde24eb488da23b75a96f3a (patch) | |
| tree | 13a332112d3b9d8ebbd95eaf7342a34ecdda0de8 /manifests | |
| parent | 2d4c9a44fc130b3997c3c6be50a74231bae46c3b (diff) | |
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 <fpan@redhat.com>
(cherry picked from commit 82b874e3f46b4a4b0b1e059135d5f05c9ac4c3f0)
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/neutron/opendaylight.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/vpp.pp | 19 |
2 files changed, 17 insertions, 4 deletions
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', diff --git a/manifests/profile/base/vpp.pp b/manifests/profile/base/vpp.pp index 4eff434..c9759f6 100644 --- a/manifests/profile/base/vpp.pp +++ b/manifests/profile/base/vpp.pp @@ -34,11 +34,24 @@ class tripleo::profile::base::vpp ( # If this is a ha scenario, we won't configure here. $controllers = any2array(split(hiera('controller_node_ips'), ',')) if !empty($vpp_ctlplane_cidr) and size($controllers) == 1 { - exec { 'vpp admin interface config': - command => "ip link add vpp-admin type veth peer name veth-admin && ip li set dev veth-admin master br-ctlplane && ifconfig veth-admin up && vppctl create host-interface name vpp-admin && vppctl set int ip addr host-vpp-admin ${vpp_ctlplane_cidr} && vppctl set interface state host-vpp-admin up", + exec { 'vpp admin - kernel interface config': + command => "ip link add vpp-admin type veth peer name veth-admin && ip li set dev veth-admin master br-ctlplane && ifconfig veth-admin up", path => ['/bin', '/sbin'], unless => 'ip link show veth-admin | grep br-ctlplane', - require => Class['fdio'], + require => Class['fdio'], + } + file_line { 'create vpp-admin interface': + path => '/etc/vpp/vpp-exec', + line => "create host-interface name vpp-admin", + } -> + file_line { 'set vpp-admin interface ip': + path => '/etc/vpp/vpp-exec', + line => "set int ip addr host-vpp-admin ${vpp_ctlplane_cidr}", + } -> + file_line { 'unshut vpp-admin interface': + path => '/etc/vpp/vpp-exec', + line => "set interface state host-vpp-admin up", + notify => Service['vpp'], } } } |