diff options
Diffstat (limited to 'plugins/dpdk/roles/ins_ovs')
| -rw-r--r-- | plugins/dpdk/roles/ins_ovs/tasks/ovs.yml | 12 | ||||
| -rw-r--r-- | plugins/dpdk/roles/ins_ovs/templates/start_ovs_vswitchd.sh.j2 | 4 | ||||
| -rw-r--r-- | plugins/dpdk/roles/ins_ovs/templates/start_ovsdb_server.sh.j2 | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/plugins/dpdk/roles/ins_ovs/tasks/ovs.yml b/plugins/dpdk/roles/ins_ovs/tasks/ovs.yml index 9f728696..64475c6a 100644 --- a/plugins/dpdk/roles/ins_ovs/tasks/ovs.yml +++ b/plugins/dpdk/roles/ins_ovs/tasks/ovs.yml @@ -1,11 +1,11 @@ -# ############################################################################# +############################################################################## # Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -# ############################################################################# +############################################################################## --- - name: install prerequisites package apt: @@ -64,11 +64,10 @@ - name: Create OVS scripts template: src: "templates/{{ item }}.j2" - dest: "/root/{{ item }}" + dest: "/opt/{{ item }}" mode: 0755 with_items: - start_ovs_vswitchd.sh - - start_ovsdb_server.sh - name: Create folders file: path={{ item }} state=directory @@ -90,8 +89,5 @@ when: ovs_dbconfig_status.stat.exists == false # yamllint enable rule:line-length -- name: Start ovsdb Server - command: /root/start_ovsdb_server.sh - - name: Start OVS vswitchd with DPDK support enabled - command: /root/start_ovs_vswitchd.sh + command: /opt/start_ovs_vswitchd.sh diff --git a/plugins/dpdk/roles/ins_ovs/templates/start_ovs_vswitchd.sh.j2 b/plugins/dpdk/roles/ins_ovs/templates/start_ovs_vswitchd.sh.j2 index c1504177..a96c8721 100644 --- a/plugins/dpdk/roles/ins_ovs/templates/start_ovs_vswitchd.sh.j2 +++ b/plugins/dpdk/roles/ins_ovs/templates/start_ovs_vswitchd.sh.j2 @@ -1,4 +1,8 @@ #!/bin/bash +ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock \ + --remote=db:Open_vSwitch,Open_vSwitch,manager_options \ + --pidfile --detach + export DB_SOCK=/usr/local/var/run/openvswitch/db.sock sudo ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true sudo ovs-vswitchd unix:$DB_SOCK --pidfile --detach diff --git a/plugins/dpdk/roles/ins_ovs/templates/start_ovsdb_server.sh.j2 b/plugins/dpdk/roles/ins_ovs/templates/start_ovsdb_server.sh.j2 deleted file mode 100644 index 8bc408b6..00000000 --- a/plugins/dpdk/roles/ins_ovs/templates/start_ovsdb_server.sh.j2 +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock \ - --remote=db:Open_vSwitch,Open_vSwitch,manager_options \ - --pidfile --detach |