diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-06-06 06:43:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-06 06:43:34 +0000 |
| commit | a1758a360cbc2d59aa0819b78050671b4839e005 (patch) | |
| tree | 9b98556d85eb24bebada7bfdc6380fd7ad5af562 /resources/ansible_roles/qtip-generator/files | |
| parent | 1b507724e4cd0542b654a96e7b59a6f6463f2848 (diff) | |
| parent | cb3795a39882bb97c15ae5c9562faf577334399b (diff) | |
Merge "Beautify the argument names"
Diffstat (limited to 'resources/ansible_roles/qtip-generator/files')
5 files changed, 12 insertions, 12 deletions
diff --git a/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml index 3d41e1b4..8b90b498 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml @@ -13,10 +13,10 @@ qtip_fixtures: fixtures qtip_dump: dump qtip_cache: "{{ qtip_cache }}" qtip_workdir: "{% raw %}{{ ansible_env.HOME }}{% endraw %}/qtip-workdir-{{ lookup('pipe', 'date +%Y%m%d-%H%M') }}" -installer_master_group: + +installer_type: "{{ installer_type }}" +installer_host: "{{ installer_host }}" +installer_group: manual: dummy-group fuel: fuel-masters apex: apex-underclouds - -installer: "{{ installer }}" -installer_master_host: "{{ installer_master_host }}" diff --git a/resources/ansible_roles/qtip-generator/files/compute/hosts b/resources/ansible_roles/qtip-generator/files/compute/hosts index 9a5f831b..0347e450 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/hosts +++ b/resources/ansible_roles/qtip-generator/files/compute/hosts @@ -1,8 +1,8 @@ localhost ansible_connection=local -{% if installer != 'manual' %} -[{{ installer_master_group[installer] }}] -{{ installer_master_host }} +{% if installer_type != 'manual' %} +[{{ installer_group[installer_type] }}] +{{ installer_host }} {% else %} [SUT] # Add hosts in system under test, example:: diff --git a/resources/ansible_roles/qtip-generator/files/compute/setup.yml b/resources/ansible_roles/qtip-generator/files/compute/setup.yml index d165a9fe..d1ab2638 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/setup.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/setup.yml @@ -10,13 +10,13 @@ # Prepare connection to SUT (System Under Test) --- -{% if installer == 'manual' %} +{% if installer_type == 'manual' %} - hosts: localhost gather_facts: no tasks: - debug: "msg='please add hosts to SUT group in `hosts` file manually.'" {% else %} -- hosts: [{{ installer_master_group[installer] }}] +- hosts: [{{ installer_group[installer_type] }}] gather_facts: no roles: - { role: qtip, tasks: generate-inventory } diff --git a/resources/ansible_roles/qtip-generator/files/compute/templates/hosts b/resources/ansible_roles/qtip-generator/files/compute/templates/hosts index 34e4aa92..49920006 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/templates/hosts +++ b/resources/ansible_roles/qtip-generator/files/compute/templates/hosts @@ -1,8 +1,8 @@ {% raw %} localhost ansible_connection=local -[{{ installer_master_group[installer] }}] -{{ installer_master_host }} +[{{ installer_group[installer_type] }}] +{{ installer_host }} [SUT:children] # system under test compute diff --git a/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg index 67246054..f0e33fd4 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg +++ b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg @@ -10,7 +10,7 @@ Host {{ name }} HostName {{ host.ansible_ssh_host }} User root - ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master_host }} 'ssh-add && nc %h %p' + ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_host }} 'ssh-add && nc %h %p' {% endfor %} {% endraw %}
\ No newline at end of file |