From 9c5d3a2ab72fa9553924ecaf70ae7ef0d1d562d0 Mon Sep 17 00:00:00 2001 From: Billy O'Mahony Date: Wed, 6 Jan 2016 17:00:41 +0000 Subject: fuel plugin: Initial version Change-Id: Ib41afff8f0b0f5e7c2f92f78cbdc48c99891b1ab Signed-off-by: Mark D. Gray Signed-off-by: Billy O'Mahony Signed-off-by: Michal Ptacek (cherry picked from commit 93f7683a2cd9b8020f8870dfc6b162b3d61c3fd2) --- .../ovsdpdk/manifests/postinstall_ovs_dpdk.pp | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp') diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp new file mode 100755 index 0000000..4a23a89 --- /dev/null +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp @@ -0,0 +1,74 @@ +# == Class ovsdpdk::postinstall_ovs_dpdk +# +# Postinstall configuration of ovs-dpdk service +# +class ovsdpdk::postinstall_ovs_dpdk ( + $plugin_dir = $::ovsdpdk::params::plugin_dir, + $nova_conf = $::ovsdpdk::params::nova_conf, + $openvswitch_service_name = $::ovsdpdk::params::openvswitch_service_name, + $ml2_ovs_conf = $::ovsdpdk::params::ml2_ovs_conf, + $neutron_l3_conf = $::ovsdpdk::params::neutron_l3_conf, + $openvswitch_agent = $::ovsdpdk::params::openvswitch_agent, +) inherits ovsdpdk { + + require ovsdpdk::install_ovs_dpdk + + package {'crudini': ensure => installed } + + if $compute == 'True' { + # adapt configuration files + exec {'adapt_nova_conf': + command => "${plugin_dir}/files/set_vcpu_pin.sh ${nova_conf}", + path => ['/usr/bin','/bin'], + user => root, + onlyif => "test -f ${nova_conf}", + require => Package['crudini'], + } + + exec {'adapt_ml2_conf': + command => "sudo crudini --set ${ml2_ovs_conf} ovs datapath_type ${ovs_datapath_type}", + path => ['/usr/bin','/bin'], + user => root, + onlyif => "test -f ${ml2_ovs_conf}", + require => Package['crudini'], + } + + exec {'adapt_neutron_l3': + command => "sudo crudini --set ${neutron_l3_conf} DEFAULT external_network_bridge br-ex", + path => ['/usr/bin','/bin'], + user => root, + onlyif => "test -f ${neutron_l3_conf}", + require => Package['crudini'], + } + + + service {"${openvswitch_service_name}": ensure => 'running' } + + # restart OVS to synchronize ovsdb-server with ovs-vswitchd needed + # due to several new --no-wait entries + exec {'restart_ovs': + command => "/usr/sbin/service ${openvswitch_service_name} restart", + user => root, + require => Service["${openvswitch_service_name}"], + } + + exec { "${plugin_dir}/files/configure_bridges.sh ${ovs_datapath_type}": + user => root, + require => Exec['restart_ovs'], + } + } + + if $controller == 'True' { + service {'neutron-server': + ensure => 'running', + } + } + + if $compute == 'True' { + service {"${openvswitch_agent}": + ensure => 'running', + require => [ Exec['restart_ovs'], Service["${openvswitch_service_name}"] ], + } + } + +} -- cgit 1.2.3-korg