Remove obsolete puppet-ovs_dpdk
Integration of Open vSwitch into the configuration framework no longer requires the temporary puppet-ovs_dpdk package and can be removed. Change-Id: I5a144df2d69b8ac0f9a7707291562bfab5cc6158 Signed-off-by: Matt Peters <matt.peters@windriver.com>
This commit is contained in:
Matt Peters
parent
5d34966c9b
commit
c5e36f52b3
@ -1,2 +0,0 @@
|
||||
SRC_DIR="src"
|
||||
TIS_PATCH_VER=0
|
||||
@ -1,32 +0,0 @@
|
||||
%global module_dir ovs_dpdk
|
||||
|
||||
Name: puppet-%{module_dir}
|
||||
Version: 1.0.0
|
||||
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||
Summary: Puppet ovs_dpdk module
|
||||
License: Apache
|
||||
|
||||
URL: unknown
|
||||
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python2-devel
|
||||
|
||||
%description
|
||||
A puppet module for ovs dpdk
|
||||
|
||||
%prep
|
||||
%autosetup -c %{module_dir}
|
||||
|
||||
#
|
||||
# The src for this puppet module needs to be staged to puppet/modules
|
||||
#
|
||||
%install
|
||||
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
|
||||
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
|
||||
|
||||
%files
|
||||
%{_datadir}/puppet/modules/%{module_dir}
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
[DEFAULT]
|
||||
log_file = neutron-ovs.log
|
||||
log_dir = /tmp
|
||||
|
||||
[ml2_type_flat]
|
||||
flat_networks = providernet-a,
|
||||
[ml2_type_geneve]
|
||||
vni_ranges = 1:1000
|
||||
[ml2_type_gre]
|
||||
tunnel_id_ranges = 1:1000
|
||||
[ml2_type_vlan]
|
||||
network_vlan_ranges = providernet-a
|
||||
[ml2_type_vxlan]
|
||||
vni_ranges = 1:1000
|
||||
|
||||
[ovs]
|
||||
datapath_type = netdev
|
||||
vhostuser_socket_dir = /var/run/openvswitch/
|
||||
bridge_mappings = providernet-a:br-ex
|
||||
tunnel_bridge = br-tun
|
||||
local_ip = 192.168.204.242
|
||||
@ -1,7 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
ovs-vsctl --no-wait --may-exist add-br br-ex -- set bridge br-ex datapath_type=netdev
|
||||
modprobe uio_pci_generic
|
||||
/usr/share/openvswitch/dpdk-usertools/dpdk-devbind.py --bind=uio_pci_generic 0000:00:08.0
|
||||
|
||||
ovs-vsctl --no-wait --may-exist add-port br-ex dpdk0 -- set Interface dpdk0 type=dpdk options:dpdk-devargs=0000:00:08.0
|
||||
@ -1,10 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
sysctl -w vm.nr_hugepages=1024
|
||||
mkdir -p /dev/hugepages
|
||||
mount -t hugetlbfs -o pagesize=2M none /dev/hugepages
|
||||
|
||||
ovs-vsctl --no-wait set Open_vSwitch . "other_config:dpdk-init=true"
|
||||
ovs-vsctl --no-wait set Open_vSwitch . "other_config:dpdk-lcore-mask=1"
|
||||
ovs-vsctl --no-wait set Open_vSwitch . "other_config:dpdk-alloc-mem=512"
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
IP=`ifconfig | grep "192.168" | sed -e "s/.*inet //" -e "s/ netmask.*//"`
|
||||
|
||||
if [ "x$IP" = "x" ]; then
|
||||
IP="127.0.0.1"
|
||||
fi
|
||||
|
||||
sed -i "s/local_ip.*/local_ip =$IP/" /etc/neutron/openvswitch_agent.ini
|
||||
@ -1,33 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
# update ovs-vswitchd.service
|
||||
|
||||
sed -i "/ExecStartPre=\/usr\/bin\/ovs_dpdk_config_pre/d" /usr/lib/systemd/system/ovs-vswitchd.service
|
||||
sed -i "/\[Service\]/a ExecStartPre=/usr/bin/ovs_dpdk_config_pre" /usr/lib/systemd/system/ovs-vswitchd.service
|
||||
|
||||
sed -i "/ExecStartPost=\/usr\/bin\/ovs_dpdk_config_post/d" /usr/lib/systemd/system/ovs-vswitchd.service
|
||||
sed -i "/\[Service\]/a ExecStartPost=/usr/bin/ovs_dpdk_config_post" /usr/lib/systemd/system/ovs-vswitchd.service
|
||||
|
||||
# update neutron-openvswitch-agent.servic
|
||||
sed -i "s#ExecStart=.*#ExecStart=/usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/openvswitch_agent.ini --log-file /var/log/neutron/openvswitch-agent.log#" /usr/lib/systemd/system/neutron-openvswitch-agent.service
|
||||
|
||||
sed -i "s#User=.*#User=root#" /usr/lib/systemd/system/neutron-openvswitch-agent.service
|
||||
|
||||
sed -i "/Requires=ovs-vswitchd.service/d" /usr/lib/systemd/system/neutron-openvswitch-agent.service
|
||||
sed -i "/\[Unit\]/a Requires=ovs-vswitchd.service" /usr/lib/systemd/system/neutron-openvswitch-agent.service
|
||||
|
||||
sed -i "s#After=syslog.target#After=ovs-vswitchd.service syslog.target#" /usr/lib/systemd/system/neutron-openvswitch-agent.service
|
||||
|
||||
#sed -i "/ExecStartPre=\/usr\/bin\/ovs_dpdk_config_post/d" /usr/lib/systemd/system/neutron-openvswitch-agent.service
|
||||
#sed -i "/\[Service\]/a ExecStartPre=/usr/bin/ovs_dpdk_config_post" /usr/lib/systemd/system/neutron-openvswitch-agent.service
|
||||
|
||||
#work around
|
||||
sed -i "/Requires=openvswitch.service neutron-openvswitch-agent.service neutron-l3-agent.service/d" /usr/lib/systemd/system/nova-compute.service
|
||||
sed -i "/\[Unit\]/a Requires=openvswitch.service neutron-openvswitch-agent.service neutron-l3-agent.service" /usr/lib/systemd/system/nova-compute.service
|
||||
|
||||
# update neutron-l3-agent.service
|
||||
sed -i "s#ExecStart=.*#ExecStart=/usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --log-file /var/log/neutron/l3-agent.log#" /usr/lib/systemd/system/neutron-l3-agent.service
|
||||
|
||||
sed -i "s#User=.*#User=root#" /usr/lib/systemd/system/neutron-l3-agent.service
|
||||
sed -i "s#After=syslog.target#After=neutron-openvswitch-agent.service syslog.target#" /usr/lib/systemd/system/neutron-l3-agent.service
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
class ovs_dpdk::config {
|
||||
exec { 'setup_ovsdpdk_1_1':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/bin', '/sbin' ],
|
||||
command => 'update_openvswitch_agent_ini',
|
||||
} ~>
|
||||
exec { 'setup_ovsdpdk_1_2':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/bin', '/sbin' ],
|
||||
command => 'update_service_config',
|
||||
} ~>
|
||||
exec { 'setup_ovsdpdk_1_3':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/bin', '/sbin' ],
|
||||
command => 'systemctl enable neutron-openvswitch-agent',
|
||||
} ~>
|
||||
exec { 'setup_ovsdpdk_1_4':
|
||||
path => [ '/usr/bin', '/usr/sbin', '/bin', '/sbin' ],
|
||||
command => 'systemctl enable neutron-l3-agent',
|
||||
}
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
class ovs_dpdk::config_files {
|
||||
file { '/etc/neutron/openvswitch_agent.ini':
|
||||
ensure => file,
|
||||
mode =>"0640",
|
||||
owner => 'root',
|
||||
group => 'neutron',
|
||||
source => 'puppet:///modules/ovs_dpdk/openvswitch_agent.ini',
|
||||
}
|
||||
|
||||
file { '/usr/bin/update_openvswitch_agent_ini':
|
||||
ensure => file,
|
||||
mode =>"0755",
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
source => 'puppet:///modules/ovs_dpdk/update_openvswitch_agent_ini'
|
||||
}
|
||||
|
||||
file { '/usr/bin/update_service_config':
|
||||
ensure => file,
|
||||
mode =>"0755",
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
source => 'puppet:///modules/ovs_dpdk/update_service_config'
|
||||
}
|
||||
|
||||
file { '/usr/bin/ovs_dpdk_config_pre':
|
||||
ensure => file,
|
||||
mode =>"0755",
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
source => 'puppet:///modules/ovs_dpdk/ovs_dpdk_config_pre',
|
||||
}
|
||||
|
||||
file { '/usr/bin/ovs_dpdk_config_post':
|
||||
ensure => file,
|
||||
mode =>"0755",
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
source => 'puppet:///modules/ovs_dpdk/ovs_dpdk_config_post',
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
# Class ovs_dpdk
|
||||
#
|
||||
# ovs_dpdk configuration
|
||||
#
|
||||
# == parameters
|
||||
#
|
||||
|
||||
class ovs_dpdk {
|
||||
class { ovs_dpdk::config_files: } ~>
|
||||
class { ovs_dpdk::config: }
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user