aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x3rd_party/ovs_pmd_stats/ovs_pmd_stats.py3
-rw-r--r--docker/ansible/roles/config_files/tasks/capabilities.yml3
-rw-r--r--docker/ansible/roles/config_files/templates/capabilities.conf.j2 (renamed from docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2)0
-rwxr-xr-xsystems/centos/8/build_base_machine.sh7
4 files changed, 6 insertions, 7 deletions
diff --git a/3rd_party/ovs_pmd_stats/ovs_pmd_stats.py b/3rd_party/ovs_pmd_stats/ovs_pmd_stats.py
index fc6045b..b706bcd 100755
--- a/3rd_party/ovs_pmd_stats/ovs_pmd_stats.py
+++ b/3rd_party/ovs_pmd_stats/ovs_pmd_stats.py
@@ -101,9 +101,8 @@ for el in array:
plugin_instance = el[:-1].replace(' ', '_')
else:
type_instance = el.split(':')[0].replace(' ', "_")
- value = el.split(':')[1].split(' ')[0]
+ value = el.split(':')[1].strip().split(' ')[0]
print('PUTVAL %s/%s-%s/%s-%s N:%s' % (HOSTNAME, PROG_NAME, plugin_instance, TYPE, type_instance, value))
# close socket
sock.close()
-
diff --git a/docker/ansible/roles/config_files/tasks/capabilities.yml b/docker/ansible/roles/config_files/tasks/capabilities.yml
index 55672e8..f57d55d 100644
--- a/docker/ansible/roles/config_files/tasks/capabilities.yml
+++ b/docker/ansible/roles/config_files/tasks/capabilities.yml
@@ -15,9 +15,8 @@
- name: enable capabilities plugin
template:
- src: experimental/capabilities.conf.j2
+ src: capabilities.conf.j2
dest: "{{ config_file_dir }}/capabilities.conf"
- when: flavor|default('stable')|string == 'experimental'
tags:
- capabilities
diff --git a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 b/docker/ansible/roles/config_files/templates/capabilities.conf.j2
index a422b70..a422b70 100644
--- a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2
+++ b/docker/ansible/roles/config_files/templates/capabilities.conf.j2
diff --git a/systems/centos/8/build_base_machine.sh b/systems/centos/8/build_base_machine.sh
index 45112f7..8486f3c 100755
--- a/systems/centos/8/build_base_machine.sh
+++ b/systems/centos/8/build_base_machine.sh
@@ -28,10 +28,11 @@ dnf -y update
dnf install -y yum-utils
dnf install -y epel-release
dnf install -y centos-release-opstools
-dnf builddep -y collectd
# For CentOS 8, a lot of the dependencies are from PowerTools repo
-dnf install -y 'dnf-command(config-manager)' && dnf config-manager --set-enabled PowerTools
+dnf install -y 'dnf-command(config-manager)' && dnf config-manager --set-enabled powertools
+
+dnf builddep -y collectd
# CentOS 8 doesn't have intel-cmt-cat-devel packaged, so use the version from CentOS7
dnf install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/intel-cmt-cat-3.0.1-1.el7.x86_64.rpm \
@@ -75,7 +76,7 @@ librdkafka-devel
yajl-devel
protobuf-c-devel
rrdtool-devel
-dpdk-19.11
+dpdk-19.11.3
qpid-proton-c-devel
#install epel release required for git-review