aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-25 19:29:36 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-25 19:29:36 +0800
commite6da6749be6e5143855a48c866de2cd03789d2e8 (patch)
treef14eddfc936af6b4c4c92d59b9e6d8fc4083756e /resources
parent6827bf2d62ac0935369a86b87782f404ac413570 (diff)
Merge workspace files into one folder
Change-Id: Ie8d0e8fdd6d6c212701ba1ee10b1d05da1ccca22 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources')
-rw-r--r--resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/ansible.cfg (renamed from resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg)0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/fixtures/case.json (renamed from resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json)0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/fixtures/pod.json (renamed from resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json)0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/fixtures/project.json (renamed from resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json)0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/group_vars/all.yml (renamed from resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml)0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/host_vars/localhost.yml (renamed from resources/ansible_roles/qtip-workspace/files/custom/host_vars/localhost.yml)0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/hosts (renamed from resources/ansible_roles/qtip-workspace/files/custom/hosts)0
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/run.yml (renamed from resources/ansible_roles/qtip-workspace/files/defaults/run.yml)2
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/setup.yml (renamed from resources/ansible_roles/qtip-workspace/files/defaults/setup.yml)2
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/teardown.yml (renamed from resources/ansible_roles/qtip-workspace/files/defaults/teardown.yml)2
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/templates/hosts (renamed from resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts)2
-rw-r--r--resources/ansible_roles/qtip-workspace/files/workspace/templates/ssh.cfg (renamed from resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg)2
-rw-r--r--resources/ansible_roles/qtip-workspace/tasks/main.yml7
15 files changed, 11 insertions, 6 deletions
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
--- a/resources/ansible_roles/qtip-workspace/files/defaults/group_vars/.gitkeep
+++ /dev/null
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
--- a/resources/ansible_roles/qtip-workspace/files/defaults/host_vars/.gitkeep
+++ /dev/null
diff --git a/resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg b/resources/ansible_roles/qtip-workspace/files/workspace/ansible.cfg
index a80d4ae4..a80d4ae4 100644
--- a/resources/ansible_roles/qtip-workspace/files/custom/ansible.cfg
+++ b/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
index 22abc40f..22abc40f 100644
--- a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/case.json
+++ b/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
index 654b5828..654b5828 100644
--- a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/pod.json
+++ b/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
index ecd03e83..ecd03e83 100644
--- a/resources/ansible_roles/qtip-workspace/files/defaults/fixtures/project.json
+++ b/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
index 2967f6eb..2967f6eb 100644
--- a/resources/ansible_roles/qtip-workspace/files/custom/group_vars/all.yml
+++ b/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
index 815e2ea3..815e2ea3 100644
--- a/resources/ansible_roles/qtip-workspace/files/custom/host_vars/localhost.yml
+++ b/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
index b8b4bbe6..b8b4bbe6 100644
--- a/resources/ansible_roles/qtip-workspace/files/custom/hosts
+++ b/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
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
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
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
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
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 }}"