[Update]基于Tornado重构了CMDB,为Beta0.3做准备

Author: 杨红飞

README.md

@@ -16,7 +16,7 @@
 
 #### 截图
 
-- 放一些简单示例图片，详细的使用可参考[部署文档](http://docs.opendevops.cn/zh/latest/codo-cmdb.html)、[Demo体验](https://demo.opendevops.cn/login)、视频示例  
+- 放一些简单示例图片，详细的使用可参考[部署文档](http://docs.opendevops.cn/zh/latest/codo-cmdb.html)、[Demo体验](https://demo.opendevops.cn/login)、[视频示例](https://v.youku.com/v_show/id_XNDE5MzEyNTY5Ng==.html?spm=a2hzp.8244740.0.0) 
 
 ![](./static/images/cmdb_host_list.png)  
 
@@ -60,9 +60,8 @@ docker-compose up -d
 
 ```
 #若是在本地执行需要安装很多SDK包的依赖，建议进入容器执行
-docker exec -ti <CONTAINER ID> /bin/bash 
-cd /var/www/codo-cmdb/
-python3 db_sync.py
+#cmdb_codo_cmdb_1:是你的容器名称
+docker exec -ti cmdb_codo_cmdb_1 /usr/local/bin/python3 /var/www/codo-cmdb/db_sync.py
 ```
 
 **日志文件**

doc/requirements.txt

@@ -2,5 +2,5 @@ opssdk
 pycryptodome
 boto3==1.9.5
 ansible==2.7.10
-paramiko==2.4.1
+paramiko==2.4.2
 aliyun_python_sdk_ecs==4.16.10

libs/common.py

@@ -137,6 +137,20 @@ def remote_upload_file(ip,user,ssh_key,cmd,local_file,remote_file,port=22):
 
 
 
+def remote_exec_cmd(ip,user,ssh_key,cmd,port=22):
+    '''ssh上传并执行bash for key'''
+    private_key = paramiko.RSAKey.from_private_key_file(ssh_key)
+    ssh = paramiko.SSHClient()
+    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+    ssh.connect(hostname=ip,port=port,username=user, pkey=private_key, timeout=10)
+    stdin, stdout, stderr = ssh.exec_command(cmd)
+    show_log = stdout.read().decode('utf-8').strip()
+    err_log = stderr.read().decode('utf-8').strip()
+    #print(show_log,err_log)
+    ssh.close()
+    return show_log, err_log
+
+
 def check_ip(ip_address):
     compile_ip=re.compile('^(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$')
     if compile_ip.match(ip_address):

libs/server/sync_public_key.py

@@ -10,7 +10,7 @@
 import os
 import paramiko
 from settings import PUBLIC_KEY
-from models.server import SSHConfigs,model_to_dict
+from models.server import SSHConfigs
 from libs.db_context import DBContext
 from libs.web_logs import ins_log
 from libs.common import remote_upload_file, get_key_file, exec_shell, exec_thread