fix ansible api handle_model_data function bug

JInghfut · Nov 15, 2018 · 4be9060 · 4be9060
1 parent 18420c8
commit 4be9060
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/OpsManage/utils/ansible_api_v2.py b/OpsManage/utils/ansible_api_v2.py
@@ -630,7 +630,7 @@ def handle_model_data(self,data,module_name,module_args=None):
                     else:
                         data['status'] = 'failed'
                     data_list.append(data)
-            elif success:
+            if success:
                 for x,y in success.items(): 
                     data = {}                    
                     data['ip'] = x
@@ -663,7 +663,7 @@ def handle_model_data(self,data,module_name,module_args=None):
                         data['status'] = 'succeed'
                     data_list.append(data) 
 
-            elif failed:
+            if failed:
                 for x,y in failed.items():   
                     data = {}                  
                     data['ip'] = x
@@ -703,10 +703,10 @@ def handle_model_data(self,data,module_name,module_args=None):
 #                     } 
 #                 } 
 
-    rbt = ANSRunner(resource,redisKey='1')
-    rbt.run_model(host_list=["192.168.1.235","192.168.1.234","192.168.1.233"],module_name='yum',module_args="name=htop state=present")
+#     rbt = ANSRunner(resource,redisKey='1')
+#     rbt.run_model(host_list=["192.168.1.235","192.168.1.234","192.168.1.233"],module_name='shell',module_args="1.sh")
 #     data = rbt.get_model_result()
-#     print data
+#     print(data)
 #     print data
 #     print rbt.handle_model_data(data, 'synchronize', module_args='src=/data/webserver/VManagePlatform/ dest=/data/webserver/VManagePlatform/ compress=yes delete=yes recursive=yes')
     #rbt.run_model(host_list=["192.168.1.34","192.168.1.130","192.168.1.1"],module_name='ping',module_args="")
@@ -715,4 +715,4 @@ def handle_model_data(self,data,module_name,module_args=None):
 #     data = rbt.get_playbook_result()
 #     print data
 #     print rbt.handle_playbook_data_to_html(data)
-    #print rbt.handle_model_data(module_name='copy',module_args="src=/root/git.log dest=/tmp/test.txt",data=data)
+#     print(rbt.handle_model_data(module_name='shell',module_args="1.sh",data=data))