ansible:Put plugins in alphabetical order and fix swap plugin config path

Change-Id: Ie146e0ac9ad5e8bc1721b51e4e5112db51462854
Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>

diff --git a/docker/ansible/roles/config_files/tasks/default_read_import.yml b/docker/ansible/roles/config_files/tasks/default_read_import.yml
index 589ace3..d70919b 100644 (file)
--- a/docker/ansible/roles/config_files/tasks/default_read_import.yml
+++ b/docker/ansible/roles/config_files/tasks/default_read_import.yml
@@ -13,6 +13,14 @@
 # limitations under the License.
 ---
 
+- name: enable contextswitch  plugin
+  replace:
+      path: "{{ config_file_dir }}/default_read_plugins.conf"
+      regexp: '(\s+)#LoadPlugin contextswitch(\s+.*)?$'
+      replace: '\1LoadPlugin contextswitch\2'
+  tags:
+    - contextswitch
+
 - name: enable cpu plugin
   replace:
       path: "{{ config_file_dir }}/default_read_plugins.conf"
@@ -29,6 +37,14 @@
   tags:
     - cpufreq
 
+- name: enable df plugin
+  replace:
+      path: "{{ config_file_dir }}/default_read_plugins.conf"
+      regexp: '(\s+)#LoadPlugin df(\s+.*)?$'
+      replace: '\1LoadPlugin df\2'
+  tags:
+    - df
+
 - name: enable disk plugin
   replace:
       path: "{{ config_file_dir }}/default_read_plugins.conf"
@@ -37,6 +53,30 @@
   tags:
     - disk
 
+- name: enable ethstat plugin
+  replace:
+      path: "{{ config_file_dir }}/default_read_plugins.conf"
+      regexp: '(\s+)#LoadPlugin ethstat(\s+.*)?$'
+      replace: '\1LoadPlugin ethstat\2'
+  tags:
+    - ethstat
+
+- name: enable ipc plugin
+  replace:
+      path: "{{ config_file_dir }}/default_read_plugins.conf"
+      regexp: '(\s+)#LoadPlugin ipc(\s+.*)?$'
+      replace: '\1LoadPlugin ipc\2'
+  tags:
+    - ipc
+
+- name: enable irq plugin
+  replace:
+      path: "{{ config_file_dir }}/default_read_plugins.conf"
+      regexp: '(\s+)#LoadPlugin irq(\s+.*)?$'
+      replace: '\1LoadPlugin irq\2'
+  tags:
+    - irq
+
 - name: enable load plugin
   replace:
       path: "{{ config_file_dir }}/default_read_plugins.conf"
@@ -69,46 +109,14 @@
   tags:
     - processes
 
-- name: enable irq plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin irq(\s+.*)?$'
-      replace: '\1LoadPlugin irq\2'
-  tags:
-    - irq
-
 - name: enable swap plugin
   replace:
-      path: "{{ config_file_dir }}/default_plugins.conf"
+      path: "{{ config_file_dir }}/default_read_plugins.conf"
       regexp: '(\s+)#LoadPlugin swap(\s+.*)?$'
       replace: '\1LoadPlugin swap\2'
   tags:
     - swap
 
-- name: enable ethstat plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin ethstat(\s+.*)?$'
-      replace: '\1LoadPlugin ethstat\2'
-  tags:
-    - ethstat
-
-- name: enable ipc plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin ipc(\s+.*)?$'
-      replace: '\1LoadPlugin ipc\2'
-  tags:
-    - ipc
-
-- name: enable df plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin df(\s+.*)?$'
-      replace: '\1LoadPlugin df\2'
-  tags:
-    - df
-
 - name: enable turbostat plugin
   replace:
       path: "{{ config_file_dir }}/default_read_plugins.conf"
@@ -124,12 +132,3 @@
       replace: '\1LoadPlugin uptime\2'
   tags:
     - uptime
-
-- name: enable contextswitch  plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin contextswitch(\s+.*)?$'
-      replace: '\1LoadPlugin contextswitch\2'
-  tags:
-    - contextswitch
-