From c5e6d32ae3ed32ed9e1bd63ce8558a1ff718a096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Goran=20Meki=C4=87?= <meka@lugons.org>
Date: Mon, 5 Oct 2015 15:40:51 +0200
Subject: [PATCH] Move development to vagrant role

---
 provision/roles/flarior/tasks/main.yml        | 20 -------
 provision/roles/flarior/vars/main.yml         |  5 --
 provision/roles/vagrant/handlers/main.yml     | 12 +++++
 provision/roles/vagrant/tasks/main.yml        | 53 +++++++++----------
 .../templates/local_config.py.j2              |  0
 provision/roles/vagrant/vars/main.yml         | 19 ++++---
 provision/site.yml                            |  1 -
 7 files changed, 47 insertions(+), 63 deletions(-)
 delete mode 100644 provision/roles/flarior/tasks/main.yml
 delete mode 100644 provision/roles/flarior/vars/main.yml
 rename provision/roles/{flarior => vagrant}/templates/local_config.py.j2 (100%)

diff --git a/provision/roles/flarior/tasks/main.yml b/provision/roles/flarior/tasks/main.yml
deleted file mode 100644
index 6dca6ba..0000000
--- a/provision/roles/flarior/tasks/main.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: install packages
-  sudo: yes
-  with_items: device_repair_packages
-  apt:
-    pkg: "{{ item.name }}"
-    state: latest
-
-- name: install python packages
-  sudo: yes
-  pip:
-    requirements: /vagrant/backend/requirements.txt
-
-- name: configure app
-  template:
-    src: local_config.py.j2
-    dest: /vagrant/backend/local_config.py
-
-- name: create DB tables
-  shell: "FLASK_CONFIG={{ flask_environment }} /vagrant/backend/manage.py syncdb"
diff --git a/provision/roles/flarior/vars/main.yml b/provision/roles/flarior/vars/main.yml
deleted file mode 100644
index fd93b07..0000000
--- a/provision/roles/flarior/vars/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-device_repair_packages:
-  - name: graphviz
-  - name: python-dev
-  - name: python-pip
diff --git a/provision/roles/vagrant/handlers/main.yml b/provision/roles/vagrant/handlers/main.yml
index f541bd7..007e156 100644
--- a/provision/roles/vagrant/handlers/main.yml
+++ b/provision/roles/vagrant/handlers/main.yml
@@ -2,3 +2,15 @@
 - name: init config
   with_items: vagrant_configs
   shell: "~/{{ item.name }}/bin/init.sh"
+
+- name: configure flask env
+  template:
+    src: local.fish.j2
+    dest: ~/.config/fish/local.fish
+
+- name: configure vagrant account
+  sudo: yes
+  user:
+    name: vagrant
+    shell: /usr/bin/fish
+    state: present
diff --git a/provision/roles/vagrant/tasks/main.yml b/provision/roles/vagrant/tasks/main.yml
index 9835f94..cceb565 100644
--- a/provision/roles/vagrant/tasks/main.yml
+++ b/provision/roles/vagrant/tasks/main.yml
@@ -1,4 +1,11 @@
 ---
+- name: install packages
+  sudo: yes
+  with_items: vagrant_packages
+  apt:
+    pkg: "{{ item.name }}"
+    state: latest
+
 - name: clone repos
   with_items: flarior_repos
   git:
@@ -12,36 +19,34 @@
   pip:
     requirements: /vagrant/backend/requirements_dev.txt
 
-- name: install npm
+- name: install node packages
   sudo: yes
+  with_items: node_packages
   apt:
-    pkg: npm
+    pkg: "{{ item.name }}"
     state: latest
 
 - name: install npm packages
-  sudo: yes
   npm:
     path: /vagrant/frontend
-    global: yes
 
-- name: install npm extra packages
-  sudo: yes
-  with_items: npm_extra_packages
-  npm:
-    name: "{{ item.name }}"
-    global: yes
+- name: install bower packages
+  shell: /vagrant/frontend/node_modules/bower/bin/bower install
+  args:
+    chdir: /vagrant/frontend
+
+- name: configure app
+  template:
+    src: local_config.py.j2
+    dest: /vagrant/backend/local_config.py
+
+- name: create DB tables
+  shell: "FLASK_CONFIG={{ flask_environment }} /vagrant/backend/manage.py syncdb"
 
 - name: create initial user
   sudo: yes
   shell: "FLASK_CONFIG={{ flask_environment }} /vagrant/backend/manage.py create_user -e admin@example.com -p Sekrit"
 
-- name: install packages
-  sudo: yes
-  with_items: vagrant_packages
-  apt:
-    pkg: "{{ item.name }}"
-    state: latest
-
 - name: fetch config repos
   with_items: vagrant_configs
   git:
@@ -51,15 +56,5 @@
     update: no
   notify:
     - init config
-
-- name: configure flask env
-  template:
-    src: local.fish.j2
-    dest: ~/.config/fish/local.fish
-
-- name: add user vagrant
-  sudo: yes
-  user:
-    name: vagrant
-    shell: /usr/bin/fish
-    state: present
+    - configure flask env
+    - configure vagrant account
diff --git a/provision/roles/flarior/templates/local_config.py.j2 b/provision/roles/vagrant/templates/local_config.py.j2
similarity index 100%
rename from provision/roles/flarior/templates/local_config.py.j2
rename to provision/roles/vagrant/templates/local_config.py.j2
diff --git a/provision/roles/vagrant/vars/main.yml b/provision/roles/vagrant/vars/main.yml
index 6a66d89..6599eb5 100644
--- a/provision/roles/vagrant/vars/main.yml
+++ b/provision/roles/vagrant/vars/main.yml
@@ -1,19 +1,22 @@
 ---
+flarior_repos:
+  - name: backend
+  - name: frontend
+
+node_packages:
+  - name: nodejs-legacy
+  - name: npm
+
 vagrant_packages:
   - name: cmake
   - name: fish
   - name: tmux
   - name: vim-nox
+  - name: graphviz
+  - name: python-dev
+  - name: python-pip
 
 vagrant_configs:
   - name: fish
   - name: tmux
   - name: vim
-
-flarior_repos:
-  - name: backend
-  - name: frontend
-
-npm_extra_packages:
-  - name: bower
-  - name: gulp
diff --git a/provision/site.yml b/provision/site.yml
index 9412f6c..e1bfa23 100644
--- a/provision/site.yml
+++ b/provision/site.yml
@@ -6,7 +6,6 @@
   roles:
     - common
     - postgresql
-    - flarior
 
 - name: Device Repair Provisioning
   hosts: vagrant