Updating mellanox_openstack manifests for Fuel 6.0
* removed openibd workaround for upstart bug, this was fixed in the OFED drivers. * removed mlnxvif package which is no longer used and previous vif_driver configurations. Related-bug: #1386865 Closes-bug: #1391797 Closes-bug: #1353886 Change-Id: I9c670b8392f8b3ef93f1e6bf9f6514bf2bce6c2b Signed-off-by: gilmeir <gilmeir@mellanox.com>
This commit is contained in:
parent
4c080377d5
commit
7289334ec0
@ -1,21 +0,0 @@
|
|||||||
# openibd - configure RDMA network devices
|
|
||||||
#
|
|
||||||
|
|
||||||
description "configure RDMA network devices"
|
|
||||||
|
|
||||||
start on (startup
|
|
||||||
and started udev)
|
|
||||||
stop on runlevel [!2345]
|
|
||||||
|
|
||||||
pre-start script
|
|
||||||
exec /etc/init.d/openibd start auto
|
|
||||||
exec ifup -a
|
|
||||||
end script
|
|
||||||
|
|
||||||
post-start script
|
|
||||||
exec /etc/init.d/openvswitch-switch restart
|
|
||||||
end script
|
|
||||||
|
|
||||||
|
|
||||||
post-stop exec /etc/init.d/openibd stop
|
|
||||||
|
|
@ -13,10 +13,8 @@ class mellanox_openstack::compute (
|
|||||||
physifc => $physifc,
|
physifc => $physifc,
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'mellanox_openstack::mlnxvif' :}
|
|
||||||
|
|
||||||
Service['libvirt'] ->
|
Service['libvirt'] ->
|
||||||
Class['mellanox_openstack::mlnxvif'] ->
|
|
||||||
Class['mellanox_openstack::eswitchd'] ->
|
Class['mellanox_openstack::eswitchd'] ->
|
||||||
Class['mellanox_openstack::agent']
|
Class['mellanox_openstack::agent']
|
||||||
|
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
class mellanox_openstack::mlnxvif {
|
|
||||||
include mellanox_openstack::params
|
|
||||||
|
|
||||||
$package = $::mellanox_openstack::params::mlnxvif_package
|
|
||||||
$compute_service_name = $::mellanox_openstack::params::compute_service_name
|
|
||||||
|
|
||||||
package { $package :
|
|
||||||
ensure => installed,
|
|
||||||
}
|
|
||||||
|
|
||||||
Package[$package] ->
|
|
||||||
Service[$compute_service_name]
|
|
||||||
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
class mellanox_openstack::openibd {
|
|
||||||
|
|
||||||
# Workaround for OFED upstart: ensure OFED starts before openvswitch
|
|
||||||
if ($::osfamily == 'Debian') {
|
|
||||||
file { '/etc/init/openibd.conf' :
|
|
||||||
ensure => present,
|
|
||||||
mode => '0644',
|
|
||||||
source => 'puppet:///modules/mellanox_openstack/openibd.conf',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -7,13 +7,11 @@ class mellanox_openstack::params {
|
|||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$neutron_mlnx_packages = ['openstack-neutron-mellanox']
|
$neutron_mlnx_packages = ['openstack-neutron-mellanox']
|
||||||
$mlnxvif_package = 'mlnxvif'
|
|
||||||
$agent_service = 'neutron-mlnx-agent'
|
$agent_service = 'neutron-mlnx-agent'
|
||||||
$compute_service_name = 'openstack-nova-compute'
|
$compute_service_name = 'openstack-nova-compute'
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
$neutron_mlnx_packages = ['neutron-plugin-mlnx','neutron-plugin-mlnx-agent']
|
$neutron_mlnx_packages = ['neutron-plugin-mlnx','neutron-plugin-mlnx-agent']
|
||||||
$mlnxvif_package = 'python-mlnxvif'
|
|
||||||
$agent_service = 'neutron-plugin-mlnx-agent'
|
$agent_service = 'neutron-plugin-mlnx-agent'
|
||||||
$compute_service_name = 'nova-compute'
|
$compute_service_name = 'nova-compute'
|
||||||
}
|
}
|
||||||
|
@ -448,10 +448,6 @@ class osnailyfacter::cluster_ha {
|
|||||||
} # End If keep_vips_together
|
} # End If keep_vips_together
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($::mellanox_mode != 'disabled') {
|
|
||||||
class { 'mellanox_openstack::openibd' : }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
case $::fuel_settings['role'] {
|
case $::fuel_settings['role'] {
|
||||||
@ -780,9 +776,6 @@ class osnailyfacter::cluster_ha {
|
|||||||
physnet => $net04_physnet,
|
physnet => $net04_physnet,
|
||||||
physifc => $::fuel_settings['neutron_mellanox']['physical_port'],
|
physifc => $::fuel_settings['neutron_mellanox']['physical_port'],
|
||||||
}
|
}
|
||||||
$libvirt_vif_driver = 'mlnxvif.vif.MlxEthVIFDriver'
|
|
||||||
} else {
|
|
||||||
$libvirt_vif_driver = 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'openstack::compute':
|
class { 'openstack::compute':
|
||||||
@ -832,7 +825,6 @@ class osnailyfacter::cluster_ha {
|
|||||||
nova_report_interval => $::nova_report_interval,
|
nova_report_interval => $::nova_report_interval,
|
||||||
nova_service_down_time => $::nova_service_down_time,
|
nova_service_down_time => $::nova_service_down_time,
|
||||||
state_path => $nova_hash[state_path],
|
state_path => $nova_hash[state_path],
|
||||||
libvirt_vif_driver => $libvirt_vif_driver,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($::use_ceph){
|
if ($::use_ceph){
|
||||||
|
@ -201,10 +201,6 @@ class osnailyfacter::cluster_simple {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($::mellanox_mode != 'disabled') {
|
|
||||||
class { 'mellanox_openstack::openibd' : }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
case $::fuel_settings['role'] {
|
case $::fuel_settings['role'] {
|
||||||
@ -483,9 +479,6 @@ class osnailyfacter::cluster_simple {
|
|||||||
physnet => $net04_physnet,
|
physnet => $net04_physnet,
|
||||||
physifc => $::fuel_settings['neutron_mellanox']['physical_port'],
|
physifc => $::fuel_settings['neutron_mellanox']['physical_port'],
|
||||||
}
|
}
|
||||||
$libvirt_vif_driver = 'mlnxvif.vif.MlxEthVIFDriver'
|
|
||||||
} else {
|
|
||||||
$libvirt_vif_driver = 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'openstack::compute':
|
class { 'openstack::compute':
|
||||||
@ -533,7 +526,6 @@ class osnailyfacter::cluster_simple {
|
|||||||
nova_report_interval => $::nova_report_interval,
|
nova_report_interval => $::nova_report_interval,
|
||||||
nova_service_down_time => $::nova_service_down_time,
|
nova_service_down_time => $::nova_service_down_time,
|
||||||
cinder_rate_limits => $::cinder_rate_limits,
|
cinder_rate_limits => $::cinder_rate_limits,
|
||||||
libvirt_vif_driver => $libvirt_vif_driver,
|
|
||||||
}
|
}
|
||||||
nova_config { 'DEFAULT/start_guests_on_host_boot': value => $::fuel_settings['start_guests_on_host_boot'] }
|
nova_config { 'DEFAULT/start_guests_on_host_boot': value => $::fuel_settings['start_guests_on_host_boot'] }
|
||||||
nova_config { 'DEFAULT/use_cow_images': value => $::fuel_settings['use_cow_images'] }
|
nova_config { 'DEFAULT/use_cow_images': value => $::fuel_settings['use_cow_images'] }
|
||||||
|
Loading…
Reference in New Issue
Block a user