From 92a2628e909380709ec89713b8796f498eb9981a Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Fri, 30 Mar 2018 14:47:03 +0300
Subject: [PATCH] [ansible] move deploy role in other repo

---
 ansible/deploy.yml                   | 11 ++++++++++-
 ansible/requirements.yml             |  5 +++++
 ansible/roles/deploy/tasks/clean.yml | 13 -------------
 ansible/roles/deploy/tasks/main.yml  | 26 --------------------------
 ansible/roles/deploy/tasks/npm.yml   | 21 ---------------------
 ansible/roles/deploy/tasks/repo.yml  | 18 ------------------
 ansible/roles/deploy/vars/main.yml   |  5 -----
 7 files changed, 15 insertions(+), 84 deletions(-)
 create mode 100644 ansible/requirements.yml
 delete mode 100644 ansible/roles/deploy/tasks/clean.yml
 delete mode 100644 ansible/roles/deploy/tasks/main.yml
 delete mode 100644 ansible/roles/deploy/tasks/npm.yml
 delete mode 100644 ansible/roles/deploy/tasks/repo.yml
 delete mode 100644 ansible/roles/deploy/vars/main.yml

diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index e62b931..b224a1d 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -1,3 +1,12 @@
 - hosts: all
+  vars:
+    ansible_user: holop
+    deploy_project: tankz
+    deploy_repo_url: git@bitbucket.org:infernalgames/tankz.git
+    deploy_repo_version: ansible
+    deploy_npm: yes
+    deploy_config: yes
+    deploy_gulp: yes
+    deploy_service: yes
   roles:
-    - deploy
+    - ansible-deploy
\ No newline at end of file
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
new file mode 100644
index 0000000..526d146
--- /dev/null
+++ b/ansible/requirements.yml
@@ -0,0 +1,5 @@
+---
+- src: git@bitbucket.org:shmyga/ansible-deploy.git
+  name: ansible-deploy
+  version: master
+  scm: git
\ No newline at end of file
diff --git a/ansible/roles/deploy/tasks/clean.yml b/ansible/roles/deploy/tasks/clean.yml
deleted file mode 100644
index 5f2a8e1..0000000
--- a/ansible/roles/deploy/tasks/clean.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-- name: Find old releases
-  find:
-    paths: "{{ project_dir }}/releases"
-    recurse: no
-    file_type: directory
-  register: releases
-
-- name: Delete old releases
-  file:
-    path: "{{ item.path }}"
-    state: absent
-  with_items: "{{ (releases.files | sort(attribute='path'))[0:-5] }}"
diff --git a/ansible/roles/deploy/tasks/main.yml b/ansible/roles/deploy/tasks/main.yml
deleted file mode 100644
index 9936877..0000000
--- a/ansible/roles/deploy/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- import_tasks: repo.yml
-- import_tasks: npm.yml
-
-- name: Copy config.json
-  copy:
-    src: "{{ release_dir }}/config.shmyga.ru.json"
-    dest: "{{ release_dir }}/config.json"
-    remote_src: true
-
-- name: Gulp build
-  command: "gulp default"
-  args:
-    chdir: "{{ release_dir }}"
-
-- name: Create symlink to release
-  file:
-    src: "{{ release_dir }}"
-    dest: "{{ project_dir }}/current"
-    state: link
-
-- name: Restart {{ project_name }} service
-  command: "sudo /bin/systemctl restart tankz"
-  args:
-    warn: no
-
-- import_tasks: clean.yml
\ No newline at end of file
diff --git a/ansible/roles/deploy/tasks/npm.yml b/ansible/roles/deploy/tasks/npm.yml
deleted file mode 100644
index 3e2d913..0000000
--- a/ansible/roles/deploy/tasks/npm.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- name: Create directory for node_modules
-  file:
-    path: "{{ project_dir }}/npm"
-    state: directory
-
-- name: Copy package.json
-  copy:
-    src: "{{ release_dir }}/package.json"
-    dest: "{{ project_dir }}/npm/"
-    remote_src: true
-
-- name: npm install
-  command: npm install
-  args:
-    chdir: "{{ project_dir }}/npm/"
-
-- name: Create symlink to node_modules
-  file:
-    src: "{{ project_dir }}/npm/node_modules"
-    dest: "{{ release_dir }}/node_modules"
-    state: link
\ No newline at end of file
diff --git a/ansible/roles/deploy/tasks/repo.yml b/ansible/roles/deploy/tasks/repo.yml
deleted file mode 100644
index 864b06e..0000000
--- a/ansible/roles/deploy/tasks/repo.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- name: Update git repository
-  git:
-    repo: "{{ repo_url }}"
-    dest: "{{ project_dir }}/repo"
-    version: ansible
-
-- name: Creates directory for release
-  file:
-    path: "{{ release_dir }}"
-    state: directory
-
-- name: Copy project files
-  synchronize:
-    src: "{{ project_dir }}/repo/"
-    dest: "{{ release_dir }}"
-    rsync_opts:
-      - "--exclude=.git"
-  delegate_to: "{{ inventory_hostname }}"
\ No newline at end of file
diff --git a/ansible/roles/deploy/vars/main.yml b/ansible/roles/deploy/vars/main.yml
deleted file mode 100644
index 3d9e874..0000000
--- a/ansible/roles/deploy/vars/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-ansible_user: holop
-date_str: "{{ ansible_date_time.year }}{{ ansible_date_time.month }}{{ ansible_date_time.day }}{{ ansible_date_time.hour }}{{ ansible_date_time.minute }}{{ ansible_date_time.second }}"
-
-repo_url: "git@bitbucket.org:infernalgames/{{ project_name }}.git"
-release_dir: "{{ project_dir }}/releases/{{ date_str }}"