From 89659b4607f9a121e9ce6fe8adf82cc212922026 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@osism.tech>
Date: Wed, 13 Apr 2022 10:55:22 +0200
Subject: [PATCH] ovs-dpdk: add ovs-dpdkctl.sh to the role itself

Currently the ovs-dpdkctl.sh file is present in the tools
directory and the "Copying ovs-dpdkctl tool" task accesses it.

This is bad practice. Files copied from a role should either be
referenced by an absolute path or be part of the role itself.

This change moves the ovs-dpdkctl.sh file in the files
directory of the role.

Change-Id: I01459d39207e54f270f32f37b4a5153c5a819347
---
 {tools => ansible/roles/ovs-dpdk/files}/ovs-dpdkctl.sh       | 0
 ansible/roles/ovs-dpdk/tasks/config.yml                      | 2 +-
 .../notes/move-of-ovs-dpdkctl.sh-394a8fb9a0da55f1.yaml       | 5 +++++
 setup.cfg                                                    | 1 -
 4 files changed, 6 insertions(+), 2 deletions(-)
 rename {tools => ansible/roles/ovs-dpdk/files}/ovs-dpdkctl.sh (100%)
 create mode 100644 releasenotes/notes/move-of-ovs-dpdkctl.sh-394a8fb9a0da55f1.yaml

diff --git a/tools/ovs-dpdkctl.sh b/ansible/roles/ovs-dpdk/files/ovs-dpdkctl.sh
similarity index 100%
rename from tools/ovs-dpdkctl.sh
rename to ansible/roles/ovs-dpdk/files/ovs-dpdkctl.sh
diff --git a/ansible/roles/ovs-dpdk/tasks/config.yml b/ansible/roles/ovs-dpdk/tasks/config.yml
index 672f643f57..f318b3abc4 100644
--- a/ansible/roles/ovs-dpdk/tasks/config.yml
+++ b/ansible/roles/ovs-dpdk/tasks/config.yml
@@ -28,7 +28,7 @@
 - name: Copying ovs-dpdkctl tool
   become: true
   copy:
-    src: ../tools/ovs-dpdkctl.sh
+    src: ovs-dpdkctl.sh
     dest: "{{ node_config_directory }}/ovsdpdk-db/ovs-dpdkctl.sh"
     mode: "0770"
 
diff --git a/releasenotes/notes/move-of-ovs-dpdkctl.sh-394a8fb9a0da55f1.yaml b/releasenotes/notes/move-of-ovs-dpdkctl.sh-394a8fb9a0da55f1.yaml
new file mode 100644
index 0000000000..390a74e9d9
--- /dev/null
+++ b/releasenotes/notes/move-of-ovs-dpdkctl.sh-394a8fb9a0da55f1.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    ``tools/ovs-dpdkctl.sh`` moved to
+    ``ansible/roles/ovs-dpdk/files/ovs-dpdkctl.sh``
diff --git a/setup.cfg b/setup.cfg
index f150f416c8..f2f0094740 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,6 @@ data_files =
     share/kolla-ansible/tools = tools/cleanup-containers
     share/kolla-ansible/tools = tools/cleanup-host
     share/kolla-ansible/tools = tools/cleanup-images
-    share/kolla-ansible/tools = tools/ovs-dpdkctl.sh
     share/kolla-ansible/doc = doc/*
     share/kolla-ansible/etc_examples = etc/*
     share/kolla-ansible = tools/init-runonce