x
/
fuel-plugin-contrail
Code Issues Proposed changes

Fix compute addition for DPDK-on-VF 

Change-Id: I60bf69d7ff6e68ff65200e8311341b11414d0b2d
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
This commit is contained in:
Illia Polliul 2016-10-25 16:35:23 +03:00
parent 2f116b68d1
commit 768a1972f6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment_scripts/puppet/manifests/contrail-compute-repo.pp
View File

@ -35,4 +35,14 @@ if $contrail::compute_dpdk_enabled {
command => "/bin/echo '#NOOP here. Modified by contrail plugin' > ${netconfig}",
onlyif => 'dpkg -l | grep contrail-vrouter-dpdk-init'
}
$nova_params = '/etc/puppet/modules/nova/manifests/params.pp'
$libvirt_from_contrail = 'dpkg -l | grep libvirt0 | grep contrail'
exec {'libvirt name fix':
path => '/usr/local/bin:/bin:/usr/bin/',
command => "sed -i 's/libvirtd/libvirt-bin/g' ${nova_params}",
onlyif => $libvirt_from_contrail,
}
}

8
deployment_scripts/puppet/modules/contrail/manifests/compute/nova.pp
View File

@ -63,13 +63,7 @@ class contrail::compute::nova {
line => ' name => "libvirt-bin",',
match => 'nova::params::libvirt_service_name',
}
$nova_params = '/etc/puppet/modules/nova/manifests/params.pp'
file_line { 'Replace libvirt service name 2':
path => $nova_params,
match => 'libvirt_service_name',
line => '$libvirt_service_name = \'libvirt-bin\'',
multiple => true,
}
}
Nova_config <||> ~>