Rename folders

* copy -> defaults
* render -> custom
* roles -> ansible_roles

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

35 files changed, 5 insertions, 5 deletions

diff --git a/resources/roles/inxi/tasks/main.yml b/resources/ansible_roles/inxi/tasks/main.yml
index 66c83f9d..66c83f9d 100644
--- a/resources/roles/inxi/tasks/main.yml
+++ b/resources/ansible_roles/inxi/tasks/main.yml
diff --git a/resources/roles/inxi/templates/system-info.j2 b/resources/ansible_roles/inxi/templates/system-info.j2
index 305a2af2..305a2af2 100644
--- a/resources/roles/inxi/templates/system-info.j2
+++ b/resources/ansible_roles/inxi/templates/system-info.j2
diff --git a/resources/roles/nDPI/defaults/main.yml b/resources/ansible_roles/nDPI/defaults/main.yml
index d8aae81a..d8aae81a 100644
--- a/resources/roles/nDPI/defaults/main.yml
+++ b/resources/ansible_roles/nDPI/defaults/main.yml
diff --git a/resources/roles/nDPI/tasks/main.yml b/resources/ansible_roles/nDPI/tasks/main.yml
index c53a22fc..c53a22fc 100644
--- a/resources/roles/nDPI/tasks/main.yml
+++ b/resources/ansible_roles/nDPI/tasks/main.yml
diff --git a/resources/roles/nDPI/templates/dpi-metrics.j2 b/resources/ansible_roles/nDPI/templates/dpi-metrics.j2
index 4d6e0b69..4d6e0b69 100644
--- a/resources/roles/nDPI/templates/dpi-metrics.j2
+++ b/resources/ansible_roles/nDPI/templates/dpi-metrics.j2
diff --git a/resources/roles/openssl/tasks/main.yml b/resources/ansible_roles/openssl/tasks/main.yml
index 7975c177..7975c177 100644
--- a/resources/roles/openssl/tasks/main.yml
+++ b/resources/ansible_roles/openssl/tasks/main.yml
diff --git a/resources/roles/openssl/templates/ssl-metrics.j2 b/resources/ansible_roles/openssl/templates/ssl-metrics.j2
index 6f8f8c71..6f8f8c71 100644
--- a/resources/roles/openssl/templates/ssl-metrics.j2
+++ b/resources/ansible_roles/openssl/templates/ssl-metrics.j2
diff --git a/resources/roles/opnfv-testapi/tasks/init.yml b/resources/ansible_roles/opnfv-testapi/tasks/init.yml
index 278a4e27..278a4e27 100644
--- a/resources/roles/opnfv-testapi/tasks/init.yml
+++ b/resources/ansible_roles/opnfv-testapi/tasks/init.yml
diff --git a/resources/roles/opnfv-testapi/tasks/main.yml b/resources/ansible_roles/opnfv-testapi/tasks/main.yml
index 1dd52208..1dd52208 100644
--- a/resources/roles/opnfv-testapi/tasks/main.yml
+++ b/resources/ansible_roles/opnfv-testapi/tasks/main.yml
diff --git a/resources/roles/opnfv-testapi/tasks/report.yml b/resources/ansible_roles/opnfv-testapi/tasks/report.yml
index fd23e549..fd23e549 100644
--- a/resources/roles/opnfv-testapi/tasks/report.yml
+++ b/resources/ansible_roles/opnfv-testapi/tasks/report.yml
diff --git a/resources/roles/qtip-deps/tasks/debian.yml b/resources/ansible_roles/qtip-deps/tasks/debian.yml
index 1e15a68b..1e15a68b 100644
--- a/resources/roles/qtip-deps/tasks/debian.yml
+++ b/resources/ansible_roles/qtip-deps/tasks/debian.yml
diff --git a/resources/roles/qtip-deps/tasks/main.yml b/resources/ansible_roles/qtip-deps/tasks/main.yml
index 3e885796..3e885796 100644
--- a/resources/roles/qtip-deps/tasks/main.yml
+++ b/resources/ansible_roles/qtip-deps/tasks/main.yml
diff --git a/resources/roles/qtip-deps/tasks/redhat.yml b/resources/ansible_roles/qtip-deps/tasks/redhat.yml
index 6a53aacf..6a53aacf 100644
--- a/resources/roles/qtip-deps/tasks/redhat.yml
+++ b/resources/ansible_roles/qtip-deps/tasks/redhat.yml
diff --git a/resources/roles/qtip-workspace/defaults/main.yml b/resources/ansible_roles/qtip-workspace/defaults/main.yml
index 01923073..01923073 100644
--- a/resources/roles/qtip-workspace/defaults/main.yml
+++ b/resources/ansible_roles/qtip-workspace/defaults/main.yml
diff --git a/resources/roles/qtip-workspace/files/render/ansible.cfg b/resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg
index 1e4d04f4..220cf0b3 100644
--- a/resources/roles/qtip-workspace/files/render/ansible.cfg
+++ b/resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg
@@ -56,7 +56,7 @@ gathering = smart
 
 # additional paths to search for roles in, colon separated
 #roles_path    = /etc/ansible/roles
-roles_path = {{ qtip_package }}/resources/roles
+roles_path = {{ qtip_package }}/resources/ansible_roles
 
 # uncomment this to disable SSH key host checking
 #host_key_checking = False
diff --git a/resources/roles/qtip-workspace/files/render/group_vars/all.yml b/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml
index d85eaabf..d85eaabf 100644
--- a/resources/roles/qtip-workspace/files/render/group_vars/all.yml
+++ b/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml
diff --git a/resources/roles/qtip-workspace/files/render/host_vars/localhost.yml b/resources/ansible_roles/qtip-workspace/files/custom/host_vars/localhost.yml
index 815e2ea3..815e2ea3 100644
--- a/resources/roles/qtip-workspace/files/render/host_vars/localhost.yml
+++ b/resources/ansible_roles/qtip-workspace/files/custom/host_vars/localhost.yml
diff --git a/resources/roles/qtip-workspace/files/render/hosts b/resources/ansible_roles/qtip-workspace/files/custom/hosts
index b8b4bbe6..b8b4bbe6 100644
--- a/resources/roles/qtip-workspace/files/render/hosts
+++ b/resources/ansible_roles/qtip-workspace/files/custom/hosts
diff --git a/resources/roles/qtip-workspace/files/copy/fixtures/case.json b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json
index 22abc40f..22abc40f 100644
--- a/resources/roles/qtip-workspace/files/copy/fixtures/case.json
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json
diff --git a/resources/roles/qtip-workspace/files/copy/fixtures/pod.json b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json
index 654b5828..654b5828 100644
--- a/resources/roles/qtip-workspace/files/copy/fixtures/pod.json
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json
diff --git a/resources/roles/qtip-workspace/files/copy/fixtures/project.json b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json
index ecd03e83..ecd03e83 100644
--- a/resources/roles/qtip-workspace/files/copy/fixtures/project.json
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json
diff --git a/resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep
index e69de29b..e69de29b 100644
--- a/resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep
diff --git a/resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep
index e69de29b..e69de29b 100644
--- a/resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep
diff --git a/resources/roles/qtip-workspace/files/copy/run.yml b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml
index d0f452aa..d0f452aa 100644
--- a/resources/roles/qtip-workspace/files/copy/run.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml
diff --git a/resources/roles/qtip-workspace/files/copy/setup.yml b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
index 5b4677e9..5b4677e9 100644
--- a/resources/roles/qtip-workspace/files/copy/setup.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
diff --git a/resources/roles/qtip-workspace/files/copy/templates/hosts b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts
index 6779d6f4..6779d6f4 100644
--- a/resources/roles/qtip-workspace/files/copy/templates/hosts
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts
diff --git a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg
index 6c8968d3..6c8968d3 100644
--- a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg
diff --git a/resources/roles/qtip-workspace/tasks/main.yml b/resources/ansible_roles/qtip-workspace/tasks/main.yml
index e198732b..89ce3dd4 100644
--- a/resources/roles/qtip-workspace/tasks/main.yml
+++ b/resources/ansible_roles/qtip-workspace/tasks/main.yml
@@ -7,15 +7,15 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- name: copy initial files
+- name: copying default files
   synchronize:
-    src:  copy/
+    src:  defaults/
     dest: "{{ workspace }}/"
 
-- name: generate default configuration
+- name: customizing for workspace
   template:
     src: "{{ item.src }}"
     dest: "{{ workspace }}/{{ item.path }}"
     force: yes
-  with_filetree: render
+  with_filetree: custom
   when: item.state == 'file'
diff --git a/resources/roles/ramspeed/defaults/main.yml b/resources/ansible_roles/ramspeed/defaults/main.yml
index 0cc06cf6..0cc06cf6 100644
--- a/resources/roles/ramspeed/defaults/main.yml
+++ b/resources/ansible_roles/ramspeed/defaults/main.yml
diff --git a/resources/roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml
index 73df35de..73df35de 100644
--- a/resources/roles/ramspeed/tasks/main.yml
+++ b/resources/ansible_roles/ramspeed/tasks/main.yml
diff --git a/resources/roles/ramspeed/templates/memory-metrics.j2 b/resources/ansible_roles/ramspeed/templates/memory-metrics.j2
index 4f5a8e80..4f5a8e80 100644
--- a/resources/roles/ramspeed/templates/memory-metrics.j2
+++ b/resources/ansible_roles/ramspeed/templates/memory-metrics.j2
diff --git a/resources/roles/unixbench/defaults/main.yml b/resources/ansible_roles/unixbench/defaults/main.yml
index d1facef5..d1facef5 100644
--- a/resources/roles/unixbench/defaults/main.yml
+++ b/resources/ansible_roles/unixbench/defaults/main.yml
diff --git a/resources/roles/unixbench/tasks/main.yml b/resources/ansible_roles/unixbench/tasks/main.yml
index 4c01609a..4c01609a 100644
--- a/resources/roles/unixbench/tasks/main.yml
+++ b/resources/ansible_roles/unixbench/tasks/main.yml
diff --git a/resources/roles/unixbench/templates/floating-point.j2 b/resources/ansible_roles/unixbench/templates/floating-point.j2
index 5989d77c..5989d77c 100644
--- a/resources/roles/unixbench/templates/floating-point.j2
+++ b/resources/ansible_roles/unixbench/templates/floating-point.j2
diff --git a/resources/roles/unixbench/templates/integer.j2 b/resources/ansible_roles/unixbench/templates/integer.j2
index b494515f..b494515f 100644
--- a/resources/roles/unixbench/templates/integer.j2
+++ b/resources/ansible_roles/unixbench/templates/integer.j2