diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-21 09:59:27 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-21 13:43:50 +0800 |
| commit | b1683c050b3e603378c57a21a7851dac432111b7 (patch) | |
| tree | a2d83e3fb63a7df3ce8bdc7600905fcf2f0de6b4 /resources | |
| parent | 6144eac326d14e26bbb849abea51c4cf7f3881b6 (diff) | |
Cleanup customizable variables of workspace
Change-Id: I00185b7c73692e2aeafb1307cea81f4f2d149c74
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources')
6 files changed, 14 insertions, 14 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 }} |