ops / yoho-ansible-roles · Commits

Go to a project

Authored by root
Commit 58aa9dfeba58905c1767f6c41989ceb161bb6f6a 1 parent e351661f

移动目录

Inline Side-by-side
Showing 2 changed files with 3 additions and 6 deletions
@@ -2,8 +2,9 @@ @@ -2,8 +2,9 @@
2 # -*- coding: UTF-8 -*- 2 # -*- coding: UTF-8 -*-
3 # author tiexin.yang@yoho.cn 3 # author tiexin.yang@yoho.cn
4 4
5 -from qcloud.qcloud_api import QcloudApi  
6 -from qcloud.mailer import mailman 5 +import sys
  6 +sys.path.append('../')
  7 +from lb_manager.qcloud.qcloud_api import QcloudApi
7 import json 8 import json
8 import datetime 9 import datetime
9 import argparse 10 import argparse
@@ -29,7 +30,6 @@ class EMRClusterScanner(object): @@ -29,7 +30,6 @@ class EMRClusterScanner(object):
29 self.workDir = '/home/ansible/yoho-ansible-roles/' 30 self.workDir = '/home/ansible/yoho-ansible-roles/'
30 self.inventoryFile = '{0}inventories/bigdata/hosts'.format(self.workDir) 31 self.inventoryFile = '{0}inventories/bigdata/hosts'.format(self.workDir)
31 self.playbook_resolv = '{0}playbooks/resolv.yml'.format(self.workDir) 32 self.playbook_resolv = '{0}playbooks/resolv.yml'.format(self.workDir)
32 - self.mailman = mailman()  
33 self.receivers = ['tiexin.yang@yoho.cn','kun.xiang@yoho.cn','chunhua.zhang@yoho.cn'] #已禁用 33 self.receivers = ['tiexin.yang@yoho.cn','kun.xiang@yoho.cn','chunhua.zhang@yoho.cn'] #已禁用
34 self.emrNameMap = { 34 self.emrNameMap = {
35 "emr-rt": "emr-r6bhtb5v", 35 "emr-rt": "emr-r6bhtb5v",
@@ -217,15 +217,12 @@ class EMRClusterScanner(object): @@ -217,15 +217,12 @@ class EMRClusterScanner(object):
217 continue 217 continue
218 else: 218 else:
219 print 'EMR大数据Inventory [{0}] 已更新\n{1}\n详见 http://git.yoho.cn/ops/yoho-ansible-roles/blob/master/inventories/bigdata/hosts'.format(emrName,result) 219 print 'EMR大数据Inventory [{0}] 已更新\n{1}\n详见 http://git.yoho.cn/ops/yoho-ansible-roles/blob/master/inventories/bigdata/hosts'.format(emrName,result)
220 - #self.mailman.mail(receivers=self.receivers,Content='EMR大数据Inventory [{0}] 已更新\n{1}\n详见 http://git.yoho.cn/ops/yoho-ansible-roles/blob/master/inventories/bigdata/hosts'.format(emrName,result),Title='EMR Inventory 更新结果')  
221 else: 220 else:
222 print 'EMR大数据Inventory更新失败\n请检查本地git缓存和ansible连接\n5分钟后重试' 221 print 'EMR大数据Inventory更新失败\n请检查本地git缓存和ansible连接\n5分钟后重试'
223 - #self.mailman.mail(receivers=self.receivers,Content='EMR大数据Inventory更新失败\n请检查本地git缓存和ansible连接\n5分钟后重试',Title='EMR Inventory 更新结果')  
224 time.sleep(300) 222 time.sleep(300)
225 continue 223 continue
226 except Exception as e: 224 except Exception as e:
227 print e 225 print e
228 - #self.mailman.mail(receivers=self.receivers,Content='EMR大数据Inventory更新失败\n{0}\n5分钟后重试'.format(str(e)),Title='EMR Inventory 更新结果')  
229 print 'EMR大数据Inventory更新失败\n{0}\n5分钟后重试'.format(str(e)) 226 print 'EMR大数据Inventory更新失败\n{0}\n5分钟后重试'.format(str(e))
230 time.sleep(300) 227 time.sleep(300)
231 pass 228 pass