Revert "Merge workspace files into one folder"

This reverts commit e6da6749be6e5143855a48c866de2cd03789d2e8.

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

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

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

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

diff --git a/resources/ansible_roles/qtip-workspace/files/workspace/hosts b/resources/ansible_roles/qtip-workspace/files/custom/hosts
similarity index 100%
rename from resources/ansible_roles/qtip-workspace/files/workspace/hosts
rename to resources/ansible_roles/qtip-workspace/files/custom/hosts

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

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

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

diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep b/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/resources/ansible_roles/qtip-workspace/files/workspace/run.yml b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml
similarity index 98%
rename from resources/ansible_roles/qtip-workspace/files/workspace/run.yml
rename to resources/ansible_roles/qtip-workspace/files/defaults/run.yml
index 6ae98f4..41df913 100644 (file)
--- a/resources/ansible_roles/qtip-workspace/files/workspace/run.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml
@@ -1,4 +1,3 @@
-{% raw %}
 ##############################################################################
 # Copyright (c) 2017 ZTE Corporation and others.
 #
@@ -44,4 +43,3 @@
     - { 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/workspace/setup.yml b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
similarity index 96%
rename from resources/ansible_roles/qtip-workspace/files/workspace/setup.yml
rename to resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
index 4882972..a522d67 100644 (file)
--- a/resources/ansible_roles/qtip-workspace/files/workspace/setup.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
@@ -1,4 +1,3 @@
-{% raw %}
 ##############################################################################
 # Copyright (c) 2017 ZTE Corporation and others.
 #
@@ -16,4 +15,3 @@
   gather_facts: no
   roles:
     - { role: qtip, tasks: generate-inventory }
-{% endraw %}

diff --git a/resources/ansible_roles/qtip-workspace/files/workspace/teardown.yml b/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml
similarity index 96%
rename from resources/ansible_roles/qtip-workspace/files/workspace/teardown.yml
rename to resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml
index ef013c5..4d51b64 100644 (file)
--- a/resources/ansible_roles/qtip-workspace/files/workspace/teardown.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml
@@ -1,4 +1,3 @@
-{% raw %}
 ##############################################################################
 # Copyright (c) 2017 ZTE Corporation and others.
 #
@@ -18,4 +17,3 @@
   roles:
   # teardown environment
   - { role: qtip, tasks: teardown }
-{% endraw %}

diff --git a/resources/ansible_roles/qtip-workspace/files/workspace/templates/hosts b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts
similarity index 94%
rename from resources/ansible_roles/qtip-workspace/files/workspace/templates/hosts
rename to resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts
index 2e8c762..6779d6f 100644 (file)
--- a/resources/ansible_roles/qtip-workspace/files/workspace/templates/hosts
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts
@@ -1,4 +1,3 @@
-{% raw %}
 localhost   ansible_connection=local
 
 [{{ installer_master_group[installer] }}]
@@ -19,4 +18,3 @@ ansible_ssh_common_args=-F ./ssh.cfg
 {% endfor %}
 
 {% endfor %}
-{% endraw %}

diff --git a/resources/ansible_roles/qtip-workspace/files/workspace/templates/ssh.cfg b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg
similarity index 94%
rename from resources/ansible_roles/qtip-workspace/files/workspace/templates/ssh.cfg
rename to resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg
index d719182..6c8968d 100644 (file)
--- a/resources/ansible_roles/qtip-workspace/files/workspace/templates/ssh.cfg
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg
@@ -1,4 +1,3 @@
-{% raw %}
 # Connect to target node through jump host
 #
 # OpenSSH 7.3:
@@ -13,4 +12,3 @@ 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 29da701..89ce3dd 100644 (file)
--- a/resources/ansible_roles/qtip-workspace/tasks/main.yml
+++ b/resources/ansible_roles/qtip-workspace/tasks/main.yml
@@ -7,7 +7,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- name: generating workspace
+- name: copying default files
+  synchronize:
+    src:  defaults/
+    dest: "{{ workspace }}/"
+
+- name: customizing for workspace
   template:
     src: "{{ item.src }}"
     dest: "{{ workspace }}/{{ item.path }}"