etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.11' into 4.12

This commit is contained in:
Rohit Yadav 2019-06-14 15:14:25 +05:30
parent a91a88bbc5 425ad495b1
commit ef1506b0b0
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/bindir/libvirtqemuhook.in
View File

@ -78,7 +78,9 @@ def handleMigrateBegin():
def executeCustomScripts(sysArgs):
createDirectoryIfNotExists(customDir, customDirPermissions)
if not os.path.exists(customDir) or not os.path.isdir(customDir):
return
scripts = getCustomScriptsFromDirectory()
for scriptName in scripts:
@ -127,12 +129,6 @@ def getCustomScriptsFromDirectory():
os.listdir(customDir)), key=lambda fileName: substringAfter(fileName, '_'))
def createDirectoryIfNotExists(dir, permissions):
if not os.path.exists(dir):
logger.info('Directory %s does not exist; creating it.' % dir)
os.makedirs(dir, permissions)
def substringAfter(s, delimiter):
return s.partition(delimiter)[2]