summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-21 09:59:27 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-21 13:43:50 +0800
commitb1683c050b3e603378c57a21a7851dac432111b7 (patch)
treea2d83e3fb63a7df3ce8bdc7600905fcf2f0de6b4
parent6144eac326d14e26bbb849abea51c4cf7f3881b6 (diff)
Cleanup customizable variables of workspace
Change-Id: I00185b7c73692e2aeafb1307cea81f4f2d149c74 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
-rw-r--r--resources/roles/qtip-workspace/defaults/main.yml2
-rw-r--r--resources/roles/qtip-workspace/files/copy/templates/hosts2
-rw-r--r--resources/roles/qtip-workspace/files/copy/templates/ssh.cfg2
-rw-r--r--resources/roles/qtip-workspace/files/render/group_vars/all.yml13
-rw-r--r--resources/roles/qtip-workspace/files/render/host_vars/localhost.yml7
-rw-r--r--resources/roles/qtip-workspace/files/render/hosts2
-rw-r--r--tests/integration/workspace-create.yml23
7 files changed, 31 insertions, 20 deletions
diff --git a/resources/roles/qtip-workspace/defaults/main.yml b/resources/roles/qtip-workspace/defaults/main.yml
index 55e2cbce..01923073 100644
--- a/resources/roles/qtip-workspace/defaults/main.yml
+++ b/resources/roles/qtip-workspace/defaults/main.yml
@@ -9,7 +9,7 @@
installer: fuel
-installer_master: fuel-master
+installer_master_host: fuel-master
installer_master_group:
fuel: fuel-masters
diff --git a/resources/roles/qtip-workspace/files/copy/templates/hosts b/resources/roles/qtip-workspace/files/copy/templates/hosts
index 27c8d1d6..6779d6f4 100644
--- a/resources/roles/qtip-workspace/files/copy/templates/hosts
+++ b/resources/roles/qtip-workspace/files/copy/templates/hosts
@@ -1,7 +1,7 @@
localhost ansible_connection=local
[{{ installer_master_group[installer] }}]
-{{ installer_master }}
+{{ installer_master_host }}
[fuel-groups:children]
{% for group in hosts|sort %}
diff --git a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg b/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
index d6a266ba..6c8968d3 100644
--- a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
+++ b/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
@@ -9,6 +9,6 @@
Host {{ name }}
HostName {{ host.ansible_ssh_host }}
User root
- ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master }} 'ssh-add && nc %h %p'
+ ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master_host }} 'ssh-add && nc %h %p'
{% endfor %}
diff --git a/resources/roles/qtip-workspace/files/render/group_vars/all.yml b/resources/roles/qtip-workspace/files/render/group_vars/all.yml
index af7f756b..d85eaabf 100644
--- a/resources/roles/qtip-workspace/files/render/group_vars/all.yml
+++ b/resources/roles/qtip-workspace/files/render/group_vars/all.yml
@@ -12,16 +12,9 @@ qtip_results: results
qtip_fixtures: fixtures
qtip_dump: dump
qtip_cache: .cache
-
-testapi_url: http://localhost:8000/api/v1
-project_name: qtip
-case_name: compute
-pod_name: qtip-pod
-installer: "{{ installer }}"
-version: master
-scenario: demo
-
-installer_master: "{{ installer_master }}"
installer_master_group:
fuel: fuel-masters
apex: apex-underclouds
+
+installer: "{{ installer }}"
+installer_master_host: "{{ installer_master_host }}"
diff --git a/resources/roles/qtip-workspace/files/render/host_vars/localhost.yml b/resources/roles/qtip-workspace/files/render/host_vars/localhost.yml
index 8135e809..815e2ea3 100644
--- a/resources/roles/qtip-workspace/files/render/host_vars/localhost.yml
+++ b/resources/roles/qtip-workspace/files/render/host_vars/localhost.yml
@@ -7,3 +7,10 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+# set `testapi_url` to enable reporting to testapi
+# testapi_url: http://localhost:8000/api/v1
+project_name: qtip
+case_name: "{{ case_name|default('compute') }}"
+pod_name: "{{ pod_name|default('qtip-pod') }}"
+scenario: "{{ scenario|default('generic') }}"
+version: "{{ version|default('master') }}"
diff --git a/resources/roles/qtip-workspace/files/render/hosts b/resources/roles/qtip-workspace/files/render/hosts
index bf19efab..b8b4bbe6 100644
--- a/resources/roles/qtip-workspace/files/render/hosts
+++ b/resources/roles/qtip-workspace/files/render/hosts
@@ -1,4 +1,4 @@
localhost ansible_connection=local
[{{ installer_master_group[installer] }}]
-{{ installer_master }}
+{{ installer_master_host }}
diff --git a/tests/integration/workspace-create.yml b/tests/integration/workspace-create.yml
index 0de94d4f..1b473260 100644
--- a/tests/integration/workspace-create.yml
+++ b/tests/integration/workspace-create.yml
@@ -18,13 +18,24 @@
# modify or override variables to customize the workspace
+ # opnfv environment
+
installer: fuel # <fuel|apex>
+ installer_master_host: f5 # make sure you can login it with key authentication
+
+ # set testapi_url to enable reportint to testapi
+
+# testapi_url: http://localhost:8000/api/v1
+
+ # report variables
+
+# project_name: qtip
+# case_name: compute
+# pod_name: "{{ pod_name|default('qtip-pod') }}"
+# scenario: "{{ scenario|default('generic') }}"
+# version: master
+# scenario: demo
- # test api settings
- testapi_url: http://localhost:8000/api/v1
- pod_name: qtip-pod # pod name for testapi
- scenario: default # scenario for testapi
+ # qtip settings
- # local settings
- installer_master: f5 # hostname of installer master, make sure you can login it with key authentication
qtip_package: ../../.. # relative path from **workspace**, not current directory