diff options
Diffstat (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests')
2 files changed, 76 insertions, 136 deletions
diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/install_ovs_dpdk.pp b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/install_ovs_dpdk.pp index d049077..3ee6328 100755 --- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/install_ovs_dpdk.pp +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/install_ovs_dpdk.pp @@ -16,7 +16,11 @@ class ovsdpdk::install_ovs_dpdk ( if $compute == 'True' { exec {'create_ovs_dpdk': - command => "mv /etc/init.d/openvswitch-switch /tmp/openvswitch-switch.bak;cp ${networking_ovs_dpdk_dir}/devstack/ovs-dpdk/ovs-dpdk-init /etc/init.d/openvswitch-switch;chmod +x /etc/init.d/openvswitch-switch; ln -sf /etc/init.d/openvswitch-switch /etc/init.d/ovs-dpdk; cp /etc/openvswitch/conf.db /etc/openvswitch/conf.db.pre_dpdk", + command => "mv /etc/init.d/openvswitch-switch /tmp/openvswitch-switch.bak;\ + cp ${networking_ovs_dpdk_dir}/devstack/ovs-dpdk/ovs-dpdk-init /etc/init.d/openvswitch-switch;\ + chmod +x /etc/init.d/openvswitch-switch;\ + ln -sf /etc/init.d/openvswitch-switch /etc/init.d/ovs-dpdk;\ + cp /etc/openvswitch/conf.db /etc/openvswitch/conf.db.pre_dpdk", user => root, path => ['/usr/bin','/bin'], } @@ -29,102 +33,36 @@ class ovsdpdk::install_ovs_dpdk ( require => File['/etc/default/ovs-dpdk'], } -# exec { 'update ovs service': -# command => "cp ${plugin_dir}/files/${openvswitch_service_file} ${openvswitch_service_path}/${openvswitch_service_file}", -# path => ['/usr/bin','/bin'], -# user => root, -# onlyif => "test -f ${openvswitch_service_path}/${openvswitch_service_file}", -# } - -# if $::operatingsystem == 'CentOS' { -# exec { 'systemctl daemon-reload': -# path => ['/usr/bin','/bin','/usr/sbin'], -# user => root, -# require => Exec['update ovs service'], -# } -# } - - package { 'zlib1g-dev': - ensure => installed, - } - - package { 'libglib2.0-dev': - ensure => installed, - } - - package { 'libxml2-dev': - ensure => installed, - } - - package { 'libdevmapper-dev': - ensure => installed, - } - - package { 'libpciaccess-dev': - ensure => installed, - } - - package { 'libnl-dev': - ensure => installed, - } - - package { 'pkg-config': - ensure => installed, - } - - package { 'bison': - ensure => installed, - } - - package { 'flex': - ensure => installed, - } - - package { 'libyajl2': - ensure => installed, - } - - package { 'libyajl-dev': - ensure => installed, - } - - package { 'bc': - ensure => installed, - } - - package { 'python-dev': - ensure => installed, - } - - package { 'numactl': - ensure => installed, - } - - package { 'libdbus-1-dev': - ensure => installed, - } - - package { 'libnuma1': - ensure => installed, - } - - package { 'libnuma-dev': - ensure => installed, - } - - package { 'libgnutls26': - ensure => installed, - } - - package { 'libgnutls-dev': - ensure => installed, - } + package { 'zlib1g-dev': ensure => 'installed' } + package { 'libglib2.0-dev': ensure => 'installed' } + package { 'libxml2-dev': ensure => 'installed' } + package { 'libdevmapper-dev': ensure => 'installed' } + package { 'libpciaccess-dev': ensure => 'installed' } + package { 'libnl-dev': ensure => 'installed' } + package { 'pkg-config': ensure => 'installed' } + package { 'bison': ensure => 'installed' } + package { 'flex': ensure => 'installed' } + package { 'libyajl2': ensure => 'installed' } + package { 'libyajl-dev': ensure => 'installed' } + package { 'python-dev': ensure => 'installed' } + package { 'numactl': ensure => 'installed' } + package { 'libdbus-1-dev': ensure => 'installed' } + package { 'libnuma1': ensure => 'installed' } + package { 'libnuma-dev': ensure => 'installed' } + package { 'libgnutls26': ensure => 'installed' } + package { 'libgnutls-dev': ensure => 'installed' } + + package { 'bc': ensure => 'installed' } exec {'build qemu': command => "true && cd /opt/code/qemu && ./configure --enable-kvm --target-list=x86_64-softmmu && make && make install", user => root, path => ['/usr/bin','/bin'], - require => [ Package['flex'], Package['bison'], Package['pkg-config'], Package['libnl-dev'], Package['libpciaccess-dev'], Package['libdevmapper-dev'], Package['libxml2-dev'], Package['libglib2.0-dev'], Package['zlib1g-dev'], Package['numactl'], Package['python-dev'],Package['libdbus-1-dev'],Package['bc'],Package['libnuma1'], Package['libnuma-dev'] , Package['libgnutls26'], Package['libgnutls-dev']], + require => [ Package['flex'], Package['bison'], Package['pkg-config'], Package['libnl-dev'], + Package['libpciaccess-dev'], Package['libdevmapper-dev'], Package['libxml2-dev'], + Package['libglib2.0-dev'], Package['zlib1g-dev'], Package['numactl'], Package['python-dev'], + Package['libdbus-1-dev'],Package['bc'],Package['libnuma1'], Package['libnuma-dev'], + Package['libgnutls26'], Package['libgnutls-dev']], timeout => 0, } @@ -163,16 +101,14 @@ class ovsdpdk::install_ovs_dpdk ( user => root, onlyif => 'test -f /etc/init.d/libvirtd', } -#exec {'init ovs-dpdk': -#command => '/etc/init.d/ovs-dpdk init', -#user => root, -#require => [ Exec['create_ovs_dpdk'], File['/etc/default/ovs-dpdk'] ], -#} + + # schema convert required as we are not removing original db exec { "ovsdb-tool convert /etc/openvswitch/conf.db ${ovs_dir}/vswitchd/vswitch.ovsschema": path => ['/usr/bin','/bin'], user => root, } + # patching of linux_net.py is required for removing error when setting of MTU exec { 'patch linux_net': command => "cp ${plugin_dir}/files/linux_net.py /usr/lib/python2.7/dist-packages/nova/network/linux_net.py", path => ['/usr/bin','/bin'], 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 index a3fd60f..12230c6 100755 --- 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 @@ -16,6 +16,7 @@ class ovsdpdk::postinstall_ovs_dpdk ( package {'crudini': ensure => installed } + # compute node specific changes if $compute == 'True' { # adapt configuration files exec {'adapt_nova_conf': @@ -27,10 +28,18 @@ class ovsdpdk::postinstall_ovs_dpdk ( } exec {'adapt_ml2_conf_datapath': - command => "sudo crudini --set ${ml2_ovs_conf} ovs datapath_type ${ovs_datapath_type}", + command => "sudo crudini --set ${ml2_conf} ovs datapath_type ${ovs_datapath_type}", path => ['/usr/bin','/bin'], user => root, - onlyif => "test -f ${ml2_ovs_conf}", + onlyif => "test -f ${ml2_conf}", + require => Package['crudini'], + } + + exec {'adapt_ml2_conf_agent_type': + command => "sudo crudini --set ${ml2_conf} agent agent_type 'DPDK OVS Agent'", + path => ['/usr/bin','/bin'], + user => root, + onlyif => "test -f ${ml2_conf}", require => Package['crudini'], } @@ -53,7 +62,8 @@ class ovsdpdk::postinstall_ovs_dpdk ( require => Service["${openvswitch_service_name}"], } - exec { "${plugin_dir}/files/configure_bridges.sh ${ovs_datapath_type}": + exec {'configure_bridges': + command => "${plugin_dir}/files/configure_bridges.sh ${ovs_datapath_type}", user => root, require => Exec['restart_ovs'], } @@ -73,39 +83,36 @@ class ovsdpdk::postinstall_ovs_dpdk ( user => root, require => [ Exec['libvirtd_disable_tls'], Service['libvirtd'] ], } - } - exec {'adapt_ml2_conf_mechanism_driver': - command => "sudo crudini --set ${ml2_conf} ml2 mechanism_drivers ovsdpdk", - path => ['/usr/bin','/bin'], - user => root, - onlyif => "test -f ${ml2_conf}", - require => Package['crudini'], - } + service {"${openvswitch_agent}": + ensure => 'running', + require => [ Exec['restart_ovs'], Service["${openvswitch_service_name}"], Exec['adapt_ml2_conf_datapath'], Exec['adapt_ml2_conf_agent_type'] ], + } - exec {'adapt_ml2_conf_security_group': - command => "sudo crudini --set ${ml2_conf} securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver", - path => ['/usr/bin','/bin'], - user => root, - onlyif => "test -f ${ml2_conf}", - require => Package['crudini'], + exec { "ovs-vsctl --no-wait set Open_vSwitch . other_config:pmd-cpu-mask=${ovs_pmd_core_mask}": + path => ['/usr/bin','/bin'], + user => root, + require => Service["${openvswitch_agent}"], + } } + # controller specific part if $controller == 'True' { service {'neutron-server': ensure => 'running', } exec {'append_NUMATopologyFilter': - command => "sudo crudini --set ${nova_conf} DEFAULT scheduler_default_filters RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter", + command => "sudo crudini --set ${nova_conf} DEFAULT scheduler_default_filters RetryFilter,AvailabilityZoneFilter,RamFilter,\ +CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter", path => ['/usr/bin','/bin'], user => root, onlyif => "test -f ${nova_conf}", require => Package['crudini'], } - exec { 'remove_old_agent': - command => "${plugin_dir}/files/remove_agent.sh $adminrc_user $adminrc_password $adminrc_tenant $adminrc_hostname", + exec { 'agents_flavors_update': + command => "${plugin_dir}/files/agents_flavors_update.sh", user => 'root', logoutput => 'true', timeout => 0, @@ -115,34 +122,31 @@ class ovsdpdk::postinstall_ovs_dpdk ( exec {'restart_neutron_server': command => "/usr/sbin/service neutron-server restart", user => root, - require => Exec['remove_old_agent'], + require => Exec['agents_flavors_update'], } exec {'restart_nova_scheduler': command => "/usr/sbin/service nova-scheduler restart", user => root, - require => Exec['remove_old_agent'], + require => Exec['agents_flavors_update'], } } - if $compute == 'True' { - exec { 'patch_ovs_agent': - command => "cp ${plugin_dir}/files/neutron-plugin-openvswitch-agent.conf /etc/init/neutron-plugin-openvswitch-agent.conf", - path => ['/usr/bin','/bin'], - user => root, - } - - service {"${openvswitch_agent}": - ensure => 'running', - require => [ Exec['restart_ovs'], Service["${openvswitch_service_name}"], Exec['patch_ovs_agent'] ], - } - - exec { "ovs-vsctl --no-wait set Open_vSwitch . other_config:pmd-cpu-mask=${ovs_pmd_core_mask}": - path => ['/usr/bin','/bin'], - user => root, - require => Service["${openvswitch_agent}"], - } + # common part + exec {'adapt_ml2_conf_mechanism_driver': + command => "sudo crudini --set ${ml2_conf} ml2 mechanism_drivers ovsdpdk", + path => ['/usr/bin','/bin'], + user => root, + onlyif => "test -f ${ml2_conf}", + require => Package['crudini'], } + exec {'adapt_ml2_conf_security_group': + command => "sudo crudini --set ${ml2_conf} securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver", + path => ['/usr/bin','/bin'], + user => root, + onlyif => "test -f ${ml2_conf}", + require => Package['crudini'], + } } |