From: Yujun Zhang Date: Sat, 22 Apr 2017 01:06:05 +0000 (+0800) Subject: Rename folders X-Git-Tag: opnfv-5.0.0~157 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F33645%2F2;p=qtip.git Rename folders * copy -> defaults * render -> custom * roles -> ansible_roles Change-Id: Ia96214691873f3bd8e6c5f9f433292fd912ac46e Signed-off-by: Yujun Zhang --- diff --git a/resources/roles/inxi/tasks/main.yml b/resources/ansible_roles/inxi/tasks/main.yml similarity index 100% rename from resources/roles/inxi/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/inxi/templates/system-info.j2 rename to 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 similarity index 100% rename from resources/roles/nDPI/defaults/main.yml rename to resources/ansible_roles/nDPI/defaults/main.yml diff --git a/resources/roles/nDPI/tasks/main.yml b/resources/ansible_roles/nDPI/tasks/main.yml similarity index 100% rename from resources/roles/nDPI/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/nDPI/templates/dpi-metrics.j2 rename to 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 similarity index 100% rename from resources/roles/openssl/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/openssl/templates/ssl-metrics.j2 rename to 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 similarity index 100% rename from resources/roles/opnfv-testapi/tasks/init.yml rename to 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 similarity index 100% rename from resources/roles/opnfv-testapi/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/opnfv-testapi/tasks/report.yml rename to 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 similarity index 100% rename from resources/roles/qtip-deps/tasks/debian.yml rename to 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 similarity index 100% rename from resources/roles/qtip-deps/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/qtip-deps/tasks/redhat.yml rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/defaults/main.yml rename to 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 similarity index 99% rename from resources/roles/qtip-workspace/files/render/ansible.cfg rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/render/group_vars/all.yml rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/render/host_vars/localhost.yml rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/render/hosts rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/fixtures/case.json rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/fixtures/pod.json rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/fixtures/project.json rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/run.yml rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/setup.yml rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/templates/hosts rename to 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 similarity index 100% rename from resources/roles/qtip-workspace/files/copy/templates/ssh.cfg rename to 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 similarity index 85% rename from resources/roles/qtip-workspace/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/ramspeed/defaults/main.yml rename to resources/ansible_roles/ramspeed/defaults/main.yml diff --git a/resources/roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml similarity index 100% rename from resources/roles/ramspeed/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/ramspeed/templates/memory-metrics.j2 rename to 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 similarity index 100% rename from resources/roles/unixbench/defaults/main.yml rename to resources/ansible_roles/unixbench/defaults/main.yml diff --git a/resources/roles/unixbench/tasks/main.yml b/resources/ansible_roles/unixbench/tasks/main.yml similarity index 100% rename from resources/roles/unixbench/tasks/main.yml rename to 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 similarity index 100% rename from resources/roles/unixbench/templates/floating-point.j2 rename to 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 similarity index 100% rename from resources/roles/unixbench/templates/integer.j2 rename to resources/ansible_roles/unixbench/templates/integer.j2 diff --git a/tests/integration/ansible.cfg b/tests/integration/ansible.cfg index a11bd1af..74075909 100644 --- a/tests/integration/ansible.cfg +++ b/tests/integration/ansible.cfg @@ -12,4 +12,4 @@ # some basic default values... inventory = hosts -roles_path = ../../resources/roles +roles_path = ../../resources/ansible_roles