From 6a430f89ed3eaa2af468134b9ed7f226e443e198 Mon Sep 17 00:00:00 2001 From: pengtao Date: Tue, 5 Nov 2019 14:52:05 +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 | 3 ++- deploy/deploy_keys.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/deploy_keys.py b/deploy/deploy_keys.py index 9676061..7548acb 100644 --- a/deploy/deploy_keys.py +++ b/deploy/deploy_keys.py @@ -117,7 +117,8 @@ class DeployKeys: def ansible_deploy(self, args): pdb.set_trace() an = AnsibleAPI(args['hostfile']) - data = {'dest_filename': 'x', 'source': 'x', 'project': 'x'} + tar_files = args['tar_file'].split('/')[-1] + data = {'dest_filename': tar_files, 'source': args['tar_file'], 'project': self.project} resule = an.run_playbook('deploy_keys.yml', **data) if not (resule['failed'] or resule['unreachable']): log.info(f"deploy keys with {self.p} success!") diff --git a/deploy/deploy_keys.yml b/deploy/deploy_keys.yml index 838aa63..31af548 100644 --- a/deploy/deploy_keys.yml +++ b/deploy/deploy_keys.yml @@ -2,10 +2,10 @@ tasks: - name: rsync deploy file - copy: src={{ source }} dest=/data/apps/{{ dest_filename }} + copy: src={{ source }} dest=/data/apps/{{ project }}/{{ dest_filename }} - name: back old config file shell: "rsync -avcp /data/app{{ project }}/keys /data/app{{ project }}/keys.old" - name: decomp file - shell: "cd /data/app/ && tar zxvf {{ dest_filename }} -C /data/apps/{{ project }} " \ No newline at end of file + shell: "cd /data/app/{{ project }} && tar zxvf {{ dest_filename }} " \ No newline at end of file