From 3386bdaba65ece3bbaf5eacdd8572fa8af791f0c Mon Sep 17 00:00:00 2001 From: pengtao Date: Tue, 5 Nov 2019 15:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0keys=20=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/deploy_keys.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/deploy/deploy_keys.py b/deploy/deploy_keys.py index 55d8c1a..98a609f 100644 --- a/deploy/deploy_keys.py +++ b/deploy/deploy_keys.py @@ -42,9 +42,11 @@ class DeployKeys: hostfile = self.build_hostfile(ipadr) args['hostfile'] = hostfile args['tar_file'] = tar_file[0] - self.ansible_deploy(args) + if self.ansible_deploy(args): + return True else: log.error(f"tar file no found with {self.project}") + return False else: raise Exception(f"{self.project} config not found in manager table!") @@ -122,17 +124,20 @@ class DeployKeys: resule = an.run_playbook('deploy_keys.yml', **data) if not (resule['failed'] or resule['unreachable']): log.info(f"deploy keys with {self.project} success!") + return True else: log.error(f"{self.project} deploy keys failed,{resule}", exc_info=True) + return False def main(): - import sys - project = sys.argv[1] - if not project: - raise Exception("PLS input project like loginserver_php!") - dk = DeployKeys(project) - dk.run() + projects = ['loginserver_php', 'cloud_php'] + for project in projects: + dk = DeployKeys(project) + if not dk.run(): + msg = f"deploy {project} failed" + log.error(msg, exc_info=True) + raise Exception(msg) if __name__ == "__main__":