Reorganize benchmarking tasks into ansible roles which helps to

- group task with related templates and variables
- simplify the main playbook to improve readability

See: http://docs.ansible.com/ansible/playbooks_roles.html

Change-Id: I9d3180edaac83ee9dba85ce5ac14ff574af7a905
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

diff --git a/resources/metric/inxi.yaml b/resources/roles/inxi/tasks/main.yml
similarity index 100%
rename from resources/metric/inxi.yaml
rename to resources/roles/inxi/tasks/main.yml

diff --git a/resources/roles/nDPI/defaults/main.yml b/resources/roles/nDPI/defaults/main.yml
new file mode 100644 (file)
index 0000000..d8aae81
--- /dev/null
+++ b/resources/roles/nDPI/defaults/main.yml
@@ -0,0 +1,12 @@
+#############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+#############################################################################
+
+---
+nDPI_cwd: "{{ ansible_env.HOME }}/qtip/nDPI"
+nDPI_file: "dpi.pcap"

diff --git a/resources/roles/nDPI/meta/main.yml b/resources/roles/nDPI/meta/main.yml
new file mode 100644 (file)
index 0000000..03c96c4
--- /dev/null
+++ b/resources/roles/nDPI/meta/main.yml
@@ -0,0 +1,12 @@
+#############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+#############################################################################
+
+---
+dependencies:
+  - { role: development-tools }

diff --git a/resources/metric/nDPI.yaml b/resources/roles/nDPI/tasks/main.yml
similarity index 100%
rename from resources/metric/nDPI.yaml
rename to resources/roles/nDPI/tasks/main.yml

diff --git a/resources/metric/openssl.yaml b/resources/roles/openssl/tasks/main.yml
similarity index 100%
rename from resources/metric/openssl.yaml
rename to resources/roles/openssl/tasks/main.yml

diff --git a/resources/roles/qtip-bootstrap/defaults/main.yml b/resources/roles/qtip-workspace/defaults/main.yml
similarity index 100%
rename from resources/roles/qtip-bootstrap/defaults/main.yml
rename to resources/roles/qtip-workspace/defaults/main.yml

diff --git a/resources/roles/qtip-bootstrap/files/copy/fixtures/case.json b/resources/roles/qtip-workspace/files/copy/fixtures/case.json
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/fixtures/case.json
rename to resources/roles/qtip-workspace/files/copy/fixtures/case.json

diff --git a/resources/roles/qtip-bootstrap/files/copy/fixtures/pod.json b/resources/roles/qtip-workspace/files/copy/fixtures/pod.json
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/fixtures/pod.json
rename to resources/roles/qtip-workspace/files/copy/fixtures/pod.json

diff --git a/resources/roles/qtip-bootstrap/files/copy/fixtures/project.json b/resources/roles/qtip-workspace/files/copy/fixtures/project.json
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/fixtures/project.json
rename to resources/roles/qtip-workspace/files/copy/fixtures/project.json

diff --git a/resources/roles/qtip-bootstrap/files/copy/group_vars/.gitkeep b/resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/group_vars/.gitkeep
rename to resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep

diff --git a/resources/roles/qtip-bootstrap/files/copy/host_vars/.gitkeep b/resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/host_vars/.gitkeep
rename to resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep

diff --git a/resources/roles/qtip-bootstrap/files/copy/run.yml b/resources/roles/qtip-workspace/files/copy/run.yml
similarity index 81%
rename from resources/roles/qtip-bootstrap/files/copy/run.yml
rename to resources/roles/qtip-workspace/files/copy/run.yml
index 52a6699..ddac875 100644 (file)
--- a/resources/roles/qtip-bootstrap/files/copy/run.yml
+++ b/resources/roles/qtip-workspace/files/copy/run.yml
@@ -36,30 +36,13 @@
 
   roles:
 
-    - { role: unixbench, tags: [unixbench] }
-
-  tasks:
-
-  - name: collect system information
-    include: "{{ qtip_resources }}/metric/inxi.yaml"
-
-  - name: ssl metrics
-    include: "{{ qtip_resources }}/metric/openssl.yaml"
-    tags: [ssl]
-
-  - name: DPI metrics
-    include: "{{ qtip_resources }}/metric/nDPI.yaml"
-    vars:
-      nDPI_cwd: "{{ ansible_env.HOME }}/qtip/nDPI"
-      nDPI_file: "dpi.pcap"
-    tags: [dpi]
-
-  - name: memory metrics
-    include: "{{ qtip_resources }}/metric/ramspeed.yaml"
-    vars:
-      cwd: "{{ ansible_env.HOME }}/qtip/ramspeed"
-    tags: [mem]
+    - { role: inxi, tags: [inxi, sysinfo] }
+    - { role: unixbench, tags: [unixbench, float, int] }
+    - { role: openssl, tags: [openssl, ssl]}
+    - { role: nDPI, tags: [ndpi, dpi]}
+    - { role: ramspeed, tags: [ramspeed, mem]}
 
+  post_tasks:
   - name: calculate QPI of compute
     calculate:
       metrics:

diff --git a/resources/roles/qtip-bootstrap/files/copy/setup.yml b/resources/roles/qtip-workspace/files/copy/setup.yml
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/setup.yml
rename to resources/roles/qtip-workspace/files/copy/setup.yml

diff --git a/resources/roles/qtip-bootstrap/files/copy/templates/hosts b/resources/roles/qtip-workspace/files/copy/templates/hosts
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/templates/hosts
rename to resources/roles/qtip-workspace/files/copy/templates/hosts

diff --git a/resources/roles/qtip-bootstrap/files/copy/templates/ssh.cfg b/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/copy/templates/ssh.cfg
rename to resources/roles/qtip-workspace/files/copy/templates/ssh.cfg

diff --git a/resources/roles/qtip-bootstrap/files/render/ansible.cfg b/resources/roles/qtip-workspace/files/render/ansible.cfg
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/render/ansible.cfg
rename to resources/roles/qtip-workspace/files/render/ansible.cfg

diff --git a/resources/roles/qtip-bootstrap/files/render/group_vars/all.yml b/resources/roles/qtip-workspace/files/render/group_vars/all.yml
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/render/group_vars/all.yml
rename to resources/roles/qtip-workspace/files/render/group_vars/all.yml

diff --git a/resources/roles/qtip-bootstrap/files/render/host_vars/localhost.yml b/resources/roles/qtip-workspace/files/render/host_vars/localhost.yml
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/render/host_vars/localhost.yml
rename to resources/roles/qtip-workspace/files/render/host_vars/localhost.yml

diff --git a/resources/roles/qtip-bootstrap/files/render/hosts b/resources/roles/qtip-workspace/files/render/hosts
similarity index 100%
rename from resources/roles/qtip-bootstrap/files/render/hosts
rename to resources/roles/qtip-workspace/files/render/hosts

diff --git a/resources/roles/qtip-bootstrap/tasks/main.yml b/resources/roles/qtip-workspace/tasks/main.yml
similarity index 100%
rename from resources/roles/qtip-bootstrap/tasks/main.yml
rename to resources/roles/qtip-workspace/tasks/main.yml

diff --git a/resources/roles/ramspeed/defaults/main.yml b/resources/roles/ramspeed/defaults/main.yml
new file mode 100644 (file)
index 0000000..0cc06cf
--- /dev/null
+++ b/resources/roles/ramspeed/defaults/main.yml
@@ -0,0 +1,11 @@
+#############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+#############################################################################
+
+---
+cwd: "{{ ansible_env.HOME }}/qtip/ramspeed"

diff --git a/resources/roles/ramspeed/meta/main.yml b/resources/roles/ramspeed/meta/main.yml
new file mode 100644 (file)
index 0000000..03c96c4
--- /dev/null
+++ b/resources/roles/ramspeed/meta/main.yml
@@ -0,0 +1,12 @@
+#############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+#############################################################################
+
+---
+dependencies:
+  - { role: development-tools }

diff --git a/resources/metric/ramspeed.yaml b/resources/roles/ramspeed/tasks/main.yml
similarity index 100%
rename from resources/metric/ramspeed.yaml
rename to resources/roles/ramspeed/tasks/main.yml

diff --git a/tests/integration/workspace-create.yml b/tests/integration/workspace-create.yml
index 71fd08d..919fe77 100644 (file)
--- a/tests/integration/workspace-create.yml
+++ b/tests/integration/workspace-create.yml
@@ -10,7 +10,7 @@
 ---
 - hosts: localhost
   roles:
-    - role: qtip-bootstrap
+    - role: qtip-workspace
       installer: fuel         # fuel|apex
       pod_name: qtip-pod
       scenario: default