From 3f4432611417378eb56c962b1fbc5270722e77cb Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Sat, 6 May 2017 19:23:09 +0800 Subject: [PATCH] Merge workspace template into one directory Change-Id: I384ea3611e58feb7292840d672094d49bb9e7482 Signed-off-by: Yujun Zhang --- .../qtip-workspace/files/defaults/group_vars/.gitkeep | 0 .../qtip-workspace/files/defaults/host_vars/.gitkeep | 0 .../qtip-workspace/files/{custom => template}/ansible.cfg | 0 .../files/{defaults => template}/fixtures/case.json | 0 .../files/{defaults => template}/fixtures/pod.json | 0 .../files/{defaults => template}/fixtures/project.json | 0 .../files/{custom => template}/group_vars/all.yml | 0 .../files/{custom => template}/host_vars/localhost.yml | 0 .../qtip-workspace/files/{custom => template}/hosts | 0 .../qtip-workspace/files/{defaults => template}/run.yml | 10 +++++----- .../qtip-workspace/files/{defaults => template}/setup.yml | 0 .../files/{defaults => template}/teardown.yml | 0 .../files/{defaults => template}/templates/hosts | 2 ++ .../files/{defaults => template}/templates/ssh.cfg | 2 ++ resources/ansible_roles/qtip-workspace/tasks/main.yml | 15 +++++++++------ 15 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep delete mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep rename resources/ansible_roles/qtip-workspace/files/{custom => template}/ansible.cfg (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/fixtures/case.json (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/fixtures/pod.json (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/fixtures/project.json (100%) rename resources/ansible_roles/qtip-workspace/files/{custom => template}/group_vars/all.yml (100%) rename resources/ansible_roles/qtip-workspace/files/{custom => template}/host_vars/localhost.yml (100%) rename resources/ansible_roles/qtip-workspace/files/{custom => template}/hosts (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/run.yml (65%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/setup.yml (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/teardown.yml (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/templates/hosts (94%) rename resources/ansible_roles/qtip-workspace/files/{defaults => template}/templates/ssh.cfg (94%) diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg b/resources/ansible_roles/qtip-workspace/files/template/ansible.cfg similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg rename to resources/ansible_roles/qtip-workspace/files/template/ansible.cfg diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json b/resources/ansible_roles/qtip-workspace/files/template/fixtures/case.json similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json rename to resources/ansible_roles/qtip-workspace/files/template/fixtures/case.json diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json b/resources/ansible_roles/qtip-workspace/files/template/fixtures/pod.json similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json rename to resources/ansible_roles/qtip-workspace/files/template/fixtures/pod.json diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json b/resources/ansible_roles/qtip-workspace/files/template/fixtures/project.json similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json rename to resources/ansible_roles/qtip-workspace/files/template/fixtures/project.json diff --git a/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml b/resources/ansible_roles/qtip-workspace/files/template/group_vars/all.yml similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml rename to resources/ansible_roles/qtip-workspace/files/template/group_vars/all.yml diff --git a/resources/ansible_roles/qtip-workspace/files/custom/host_vars/localhost.yml b/resources/ansible_roles/qtip-workspace/files/template/host_vars/localhost.yml similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/custom/host_vars/localhost.yml rename to resources/ansible_roles/qtip-workspace/files/template/host_vars/localhost.yml diff --git a/resources/ansible_roles/qtip-workspace/files/custom/hosts b/resources/ansible_roles/qtip-workspace/files/template/hosts similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/custom/hosts rename to resources/ansible_roles/qtip-workspace/files/template/hosts diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml b/resources/ansible_roles/qtip-workspace/files/template/run.yml similarity index 65% rename from resources/ansible_roles/qtip-workspace/files/defaults/run.yml rename to resources/ansible_roles/qtip-workspace/files/template/run.yml index 41df913b..9bb865d6 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml +++ b/resources/ansible_roles/qtip-workspace/files/template/run.yml @@ -27,11 +27,11 @@ roles: # run test and collect metrics - - { role: inxi, output: "{{ qtip_results }}/sysinfo", tags: [run, inxi, sysinfo] } - - { role: unixbench, output: "{{ qtip_results }}/arithmetic", tags: [run, unixbench, arithmetic] } - - { role: openssl, output: "{{ qtip_results }}/ssl", tags: [run, openssl, ssl] } - - { role: nDPI, output: "{{ qtip_results }}/dpi", tags: [run, ndpi, dpi] } - - { role: ramspeed, output: "{{ qtip_results }}/memory", tags: [run, ramspeed, memory] } + - { role: inxi, output: "{% raw %}{{ qtip_results }}{% endraw %}/sysinfo", tags: [run, inxi, sysinfo] } + - { role: unixbench, output: "{% raw %}{{ qtip_results }}{% endraw %}/arithmetic", tags: [run, unixbench, arithmetic] } + - { role: openssl, output: "{% raw %}{{ qtip_results }}{% endraw %}/ssl", tags: [run, openssl, ssl] } + - { role: nDPI, output: "{% raw %}{{ qtip_results }}{% endraw %}/dpi", tags: [run, ndpi, dpi] } + - { role: ramspeed, output: "{% raw %}{{ qtip_results }}{% endraw %}/memory", tags: [run, ramspeed, memory] } # calculate scores - { role: qtip, tasks: calculate, tags: [calculate] } diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml b/resources/ansible_roles/qtip-workspace/files/template/setup.yml similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/defaults/setup.yml rename to resources/ansible_roles/qtip-workspace/files/template/setup.yml diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml b/resources/ansible_roles/qtip-workspace/files/template/teardown.yml similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml rename to resources/ansible_roles/qtip-workspace/files/template/teardown.yml diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts b/resources/ansible_roles/qtip-workspace/files/template/templates/hosts similarity index 94% rename from resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts rename to resources/ansible_roles/qtip-workspace/files/template/templates/hosts index 6779d6f4..cbbfcfef 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts +++ b/resources/ansible_roles/qtip-workspace/files/template/templates/hosts @@ -1,3 +1,4 @@ +{% raw %} localhost ansible_connection=local [{{ installer_master_group[installer] }}] @@ -18,3 +19,4 @@ ansible_ssh_common_args=-F ./ssh.cfg {% endfor %} {% endfor %} +{% endraw %} \ No newline at end of file diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg b/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg similarity index 94% rename from resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg rename to resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg index 6c8968d3..67246054 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg +++ b/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg @@ -1,3 +1,4 @@ +{% raw %} # Connect to target node through jump host # # OpenSSH 7.3: @@ -12,3 +13,4 @@ Host {{ name }} ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master_host }} 'ssh-add && nc %h %p' {% endfor %} +{% endraw %} \ No newline at end of file diff --git a/resources/ansible_roles/qtip-workspace/tasks/main.yml b/resources/ansible_roles/qtip-workspace/tasks/main.yml index 89ce3dd4..4331468d 100644 --- a/resources/ansible_roles/qtip-workspace/tasks/main.yml +++ b/resources/ansible_roles/qtip-workspace/tasks/main.yml @@ -7,15 +7,18 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -- name: copying default files - synchronize: - src: defaults/ - dest: "{{ workspace }}/" +- name: creating directories + file: + path: "{{ workspace }}/{{ item.path }}" + state: directory + force: yes + with_filetree: template/ + when: item.state == 'directory' -- name: customizing for workspace +- name: templating files template: src: "{{ item.src }}" dest: "{{ workspace }}/{{ item.path }}" force: yes - with_filetree: custom + with_filetree: template/ when: item.state == 'file' -- 2.16.6