summaryrefslogtreecommitdiffstats
path: root/benchmarks/playbooks/sys_info_pbook.yaml
diff options
context:
space:
mode:
authorMofassir Arif <Mofassir_arif@dellteam.com>2015-12-16 02:25:51 -0800
committerMofassir Arif <Mofassir_arif@dellteam.com>2015-12-16 03:41:54 -0800
commit8c9207f71147e9e4b44f813793c5bf04f4eba381 (patch)
tree1682854be20c020443b1fa35ed39dace5d77f9b9 /benchmarks/playbooks/sys_info_pbook.yaml
parentae3870b6863604d39bd15b0212bcf2694076a034 (diff)
Removed Root previlages
QTIP now uses a key of its own to ssh into VMs The ssh for the baremetal servers still needs work Change-Id: I1aa37e07c4f9b3f7f4902d16cdbf74f39eb6c698 Signed-off-by: Mofassir Arif <Mofassir_arif@dellteam.com> Conflicts: .gitignore
Diffstat (limited to 'benchmarks/playbooks/sys_info_pbook.yaml')
-rw-r--r--benchmarks/playbooks/sys_info_pbook.yaml6
1 files changed, 1 insertions, 5 deletions
diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml
index 9eca0bc3..19c811c7 100644
--- a/benchmarks/playbooks/sys_info_pbook.yaml
+++ b/benchmarks/playbooks/sys_info_pbook.yaml
@@ -7,7 +7,6 @@
- name: system info collection tool install when Ubuntu
shell: apt-get install inxi -y
when: ansible_os_family == "Debian"
-<<<<<<< HEAD
- name: Install ansible copy dependencies if remote host has selinux enabled
shell: yum install libselinux-python -y
when: ansible_os_family == "RedHat"
@@ -22,11 +21,8 @@
- name: collecting system information for network test cases
shell: cd $HOME/qtip_result && python info_collect.py n
when: network
-=======
- name: system_info script copy
copy: src=./info_script/info_collect.py dest={{home_dir.stdout}}/qtip_result/
- name: collecting_sys_info
- shell: cd $HOME/qtip_result && python info_collect.py
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
-
+ shell: cd $HOME/qtip_result && python info_collect.py