From e6da6749be6e5143855a48c866de2cd03789d2e8 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Tue, 25 Apr 2017 19:29:36 +0800 Subject: [PATCH] Merge workspace files into one folder Change-Id: Ie8d0e8fdd6d6c212701ba1ee10b1d05da1ccca22 Signed-off-by: Yujun Zhang --- .../qtip-workspace/files/defaults/group_vars/.gitkeep | 0 .../ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep | 0 .../qtip-workspace/files/{custom => workspace}/ansible.cfg | 0 .../files/{defaults => workspace}/fixtures/case.json | 0 .../qtip-workspace/files/{defaults => workspace}/fixtures/pod.json | 0 .../files/{defaults => workspace}/fixtures/project.json | 0 .../qtip-workspace/files/{custom => workspace}/group_vars/all.yml | 0 .../files/{custom => workspace}/host_vars/localhost.yml | 0 .../ansible_roles/qtip-workspace/files/{custom => workspace}/hosts | 0 .../qtip-workspace/files/{defaults => workspace}/run.yml | 2 ++ .../qtip-workspace/files/{defaults => workspace}/setup.yml | 2 ++ .../qtip-workspace/files/{defaults => workspace}/teardown.yml | 2 ++ .../qtip-workspace/files/{defaults => workspace}/templates/hosts | 2 ++ .../qtip-workspace/files/{defaults => workspace}/templates/ssh.cfg | 2 ++ resources/ansible_roles/qtip-workspace/tasks/main.yml | 7 +------ 15 files changed, 11 insertions(+), 6 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 => workspace}/ansible.cfg (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/fixtures/case.json (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/fixtures/pod.json (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/fixtures/project.json (100%) rename resources/ansible_roles/qtip-workspace/files/{custom => workspace}/group_vars/all.yml (100%) rename resources/ansible_roles/qtip-workspace/files/{custom => workspace}/host_vars/localhost.yml (100%) rename resources/ansible_roles/qtip-workspace/files/{custom => workspace}/hosts (100%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/run.yml (98%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/setup.yml (96%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/teardown.yml (96%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/templates/hosts (94%) rename resources/ansible_roles/qtip-workspace/files/{defaults => workspace}/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/workspace/ansible.cfg similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg rename to resources/ansible_roles/qtip-workspace/files/workspace/ansible.cfg diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json b/resources/ansible_roles/qtip-workspace/files/workspace/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/workspace/fixtures/case.json diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json b/resources/ansible_roles/qtip-workspace/files/workspace/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/workspace/fixtures/pod.json diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json b/resources/ansible_roles/qtip-workspace/files/workspace/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/workspace/fixtures/project.json diff --git a/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml b/resources/ansible_roles/qtip-workspace/files/workspace/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/workspace/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/workspace/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/workspace/host_vars/localhost.yml diff --git a/resources/ansible_roles/qtip-workspace/files/custom/hosts b/resources/ansible_roles/qtip-workspace/files/workspace/hosts similarity index 100% rename from resources/ansible_roles/qtip-workspace/files/custom/hosts rename to resources/ansible_roles/qtip-workspace/files/workspace/hosts diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml b/resources/ansible_roles/qtip-workspace/files/workspace/run.yml similarity index 98% rename from resources/ansible_roles/qtip-workspace/files/defaults/run.yml rename to resources/ansible_roles/qtip-workspace/files/workspace/run.yml index 41df913b..6ae98f43 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml +++ b/resources/ansible_roles/qtip-workspace/files/workspace/run.yml @@ -1,3 +1,4 @@ +{% raw %} ############################################################################## # Copyright (c) 2017 ZTE Corporation and others. # @@ -43,3 +44,4 @@ - { role: qtip, tasks: aggregate, tags: [aggregate] } # publish results - { role: opnfv-testapi, tasks: report, when: testapi_url is defined, tags: [report] } +{% endraw %} diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml b/resources/ansible_roles/qtip-workspace/files/workspace/setup.yml similarity index 96% rename from resources/ansible_roles/qtip-workspace/files/defaults/setup.yml rename to resources/ansible_roles/qtip-workspace/files/workspace/setup.yml index a522d67b..48829726 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml +++ b/resources/ansible_roles/qtip-workspace/files/workspace/setup.yml @@ -1,3 +1,4 @@ +{% raw %} ############################################################################## # Copyright (c) 2017 ZTE Corporation and others. # @@ -15,3 +16,4 @@ gather_facts: no roles: - { role: qtip, tasks: generate-inventory } +{% endraw %} diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml b/resources/ansible_roles/qtip-workspace/files/workspace/teardown.yml similarity index 96% rename from resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml rename to resources/ansible_roles/qtip-workspace/files/workspace/teardown.yml index 4d51b64f..ef013c51 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml +++ b/resources/ansible_roles/qtip-workspace/files/workspace/teardown.yml @@ -1,3 +1,4 @@ +{% raw %} ############################################################################## # Copyright (c) 2017 ZTE Corporation and others. # @@ -17,3 +18,4 @@ roles: # teardown environment - { role: qtip, tasks: teardown } +{% endraw %} diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts b/resources/ansible_roles/qtip-workspace/files/workspace/templates/hosts similarity index 94% rename from resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts rename to resources/ansible_roles/qtip-workspace/files/workspace/templates/hosts index 6779d6f4..2e8c762e 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts +++ b/resources/ansible_roles/qtip-workspace/files/workspace/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 %} diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg b/resources/ansible_roles/qtip-workspace/files/workspace/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/workspace/templates/ssh.cfg index 6c8968d3..d719182c 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg +++ b/resources/ansible_roles/qtip-workspace/files/workspace/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 %} diff --git a/resources/ansible_roles/qtip-workspace/tasks/main.yml b/resources/ansible_roles/qtip-workspace/tasks/main.yml index 89ce3dd4..29da701f 100644 --- a/resources/ansible_roles/qtip-workspace/tasks/main.yml +++ b/resources/ansible_roles/qtip-workspace/tasks/main.yml @@ -7,12 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -- name: copying default files - synchronize: - src: defaults/ - dest: "{{ workspace }}/" - -- name: customizing for workspace +- name: generating workspace template: src: "{{ item.src }}" dest: "{{ workspace }}/{{ item.path }}" -- 2.16.6