x/fuel-plugin-mellanox
Code Issues Proposed changes

Fix nova compute service duplication for IB

Browse Source 
Change-Id: Iafa394f59c379ca450b700a2f0e67ad91276fbf4
This commit is contained in:
Aviram Bar-Haim 2016-02-25 12:09:25 +02:00
parent 74542858a4
commit 6c010bb84f
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment_scripts/puppet/modules/mellanox_openstack/manifests/agent.pp
View File

@ -2,13 +2,13 @@ class mellanox_openstack::agent (
$physnet,
$physifc,
) {
include nova::params
include mellanox_openstack::params
$package = $::mellanox_openstack::params::neutron_mlnx_packages_compute
$agent = $::mellanox_openstack::params::agent_service
$filters_dir = $::mellanox_openstack::params::filters_dir
$filters_file = $::mellanox_openstack::params::filters_file
$compute_service_name = $::mellanox_openstack::params::compute_service_name
$mlnx_agent_conf = $::mellanox_openstack::params::mlnx_agent_conf
$mlnx_agent_init_file = $::mellanox_openstack::params::mlnx_agent_init_file
@ -33,7 +33,7 @@ class mellanox_openstack::agent (
File <| title == '/etc/nova/nova.conf' |> ->
File[$filters_dir] ->
File[$filters_file] ~>
Service[$compute_service_name]
Service[$nova::params::compute_service_name]
}
file { $mlnx_agent_conf :
@ -61,19 +61,12 @@ class mellanox_openstack::agent (
hasrestart => true,
}
service { $compute_service_name :
ensure => running,
enable => true,
hasstatus => true,
hasrestart => true,
}
Package[$package] ->
File[$mlnx_agent_conf] ->
Mellanox_agent_config <||> ~>
Exec[fix_mlnx_agent_init] ~>
Service[$agent] ~>
Service[$compute_service_name]
Service[$nova::params::compute_service_name]
Package[$package] ~>
Service[$agent]

7
deployment_scripts/puppet/modules/mellanox_openstack/manifests/compute_sriov.pp
View File

@ -20,10 +20,13 @@ class mellanox_openstack::compute_sriov (
# configure pci_passthrough_whitelist nova compute
if ($pci_passthrough_addresses) {
nova_config { 'DEFAULT/pci_passthrough_whitelist':
value => check_array_of_hash("${pci_passthrough_addresses}"),
value => check_array_of_hash("${pci_passthrough_addresses}"),
} ~>
service { $nova::params::compute_service_name:
ensure => running
ensure => running,
enable => true,
hasstatus => true,
hasrestart => true,
}
}

2
metadata.yaml
View File

@ -5,7 +5,7 @@ name: mellanox-plugin
title: Mellanox Openstack features
# Plugin version
version: 2.0.27
version: 2.0.28
# Description
description: Enable features over Mellanox hardware