diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-06-05 21:51:51 +0800 |
---|---|---|
committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-06-05 23:46:33 +0800 |
commit | cb3795a39882bb97c15ae5c9562faf577334399b (patch) | |
tree | 6bbd1d366b1e214bed87398ff7a1db102c607459 /resources/ansible_roles/qtip-generator/files/compute/templates | |
parent | 0ce21bc2fc83faa3462de9fd52360cb0d6fae71d (diff) |
Beautify the argument names
- keep the argument consisten with OPNFV convention
- installer-ip is not used because in fact we use host address instead
- remove optional argurment from prompt
Change-Id: I3db3cf53b62cc86e143bc59a7dd8bb83d0f74b7d
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources/ansible_roles/qtip-generator/files/compute/templates')
-rw-r--r-- | resources/ansible_roles/qtip-generator/files/compute/templates/hosts | 4 | ||||
-rw-r--r-- | resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg | 2 |
2 files changed, 3 insertions, 3 deletions
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 |