comnify distribution wise setup and install prerequisites separately

playbooks/develop/centos.yml

@@ -9,7 +9,6 @@
     mysql_conf_tpl: ../files/mariadb_config.cnf
     mysql_secure_installation: True
   roles:
-    - prerequisites
     - mariadb
     - wkhtmltopdf
     - nodejs

playbooks/develop/install.yml

@@ -1,14 +1,45 @@
 ---
 - hosts: localhost
 
+- include: setup_essentials.yml
+
+- include: ../prerequisites/install_prerequisites.yml
+
 - include: macosx.yml
   when: ansible_distribution == 'MacOSX'
 
-- include: ubuntu.yml
+- name: "Setup mariadb, wkhtmltopdf, nodejs and psutil"
-  when: ansible_distribution == 'Ubuntu'
+  hosts: localhost
+  become: yes
+  become_user: root
+  vars:
+    mysql_conf_tpl: ../files/mariadb_config.cnf
+    mysql_secure_installation: True
+  roles:
+    - mariadb
+    - wkhtmltopdf
+    - nodejs
+    - psutil
 
-- include: centos.yml
+- name: setup bench and dev environment
-  when: ansible_distribution == 'CentOS'
+  hosts: localhost
+  vars:
+    bench_repo_path: "/home/{{ ansible_user_id }}/.bench"
+    bench_path: "/home/{{ ansible_user_id }}/{{ bench_name }}"
+  tasks:
+  # setup frappe-bench
+  - include: includes/setup_bench.yml
+    when: not run_travis and not without_bench_setup
 
-- include: debian.yml
+  # setup development environment
-  when: ansible_distribution == 'Debian'
+  - include: includes/setup_dev_env.yml
+    when: not run_travis and not production
+
+# - include: ubuntu.yml
+#   when: ansible_distribution == 'Ubuntu'
+#
+# - include: centos.yml
+#   when: ansible_distribution == 'CentOS'
+#
+# - include: debian.yml
+#   when: ansible_distribution == 'Debian'

playbooks/develop/roles/prerequisites/tasks/main.yml

@@ -1,94 +0,0 @@
----
-# Prerequisite for centos
-- name: Install yum packages
-  yum: name={{ item }} state=present
-  with_items:
-    - bzip2-devel
-    - cronie
-    - dnsmasq
-    - freetype-devel
-    - git
-    - htop
-    - lcms2-devel
-    - libjpeg-devel
-    - libtiff-devel
-    - libffi-devel
-    - libwebp-devel
-    - libXext
-    - libXrender
-    - libzip-devel
-    - libffi-devel
-    - ntp
-    - openssl-devel
-    - postfix
-    - python-devel
-    - python-setuptools
-    - python-pip
-    - redis
-    - screen
-    - sudo
-    - supervisor
-    - tcl-devel
-    - tk-devel
-    - vim
-    - which
-    - xorg-x11-fonts-75dpi
-    - xorg-x11-fonts-Type1
-    - zlib-devel
-    - openssl-devel
-    - openldap-devel
-  when: ansible_os_family == 'RedHat'
-
-# Prerequisite for Debian and Ubuntu
-- name: Install apt packages
-  apt: pkg={{ item }} state=present force=yes
-  with_items:
-    - build-essential
-    - software-properties-common
-    - dnsmasq
-    - fontconfig
-    - git
-    - htop
-    - libcrypto++-dev
-    - libfreetype6-dev
-    - liblcms2-dev
-    - libssl-dev
-    - libwebp-dev
-    - libxext6
-    - libxrender1
-    - libxslt1-dev
-    - libxslt1.1
-    - libffi-dev
-    - ntp
-    - postfix
-    - python-dev
-    - python-pip
-    - python-tk
-    - redis-server
-    - screen
-    - supervisor
-    - vim
-    - xfonts-75dpi
-    - xfonts-base
-    - zlib1g-dev
-    - apt-transport-https
-    - libsasl2-dev
-    - libldap2-dev
-    - libjpeg8-dev
-  when: ansible_os_family == 'Debian' or ansible_distribution == 'Ubuntu'
-
-- include: ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
-
-- include: debian.yml
-  when: ansible_os_family == 'Debian'
-
-# Prerequisite for MACOS
-- name: install prequisites for macos
-  homebrew: name={{ item }} state=present
-  with_items:
-    - cmake
-    - redis
-    - mariadb
-    - nodejs
-  when: ansible_distribution == 'MacOSX'

playbooks/prerequisites/install_prerequisites.yml

@@ -0,0 +1,98 @@
+---
+- name: "Setup prerequisites"
+  hosts: localhost
+  become: yes
+  become_user: root
+  tasks:
+  - name: Install yum packages
+    yum: name={{ item }} state=present
+    with_items:
+      - bzip2-devel
+      - cronie
+      - dnsmasq
+      - freetype-devel
+      - git
+      - htop
+      - lcms2-devel
+      - libjpeg-devel
+      - libtiff-devel
+      - libffi-devel
+      - libwebp-devel
+      - libXext
+      - libXrender
+      - libzip-devel
+      - libffi-devel
+      - ntp
+      - openssl-devel
+      - postfix
+      - python-devel
+      - python-setuptools
+      - python-pip
+      - redis
+      - screen
+      - sudo
+      - supervisor
+      - tcl-devel
+      - tk-devel
+      - vim
+      - which
+      - xorg-x11-fonts-75dpi
+      - xorg-x11-fonts-Type1
+      - zlib-devel
+      - openssl-devel
+      - openldap-devel
+    when: ansible_os_family == 'RedHat'
+
+  # Prerequisite for Debian and Ubuntu
+  - name: Install apt packages
+    apt: pkg={{ item }} state=present force=yes
+    with_items:
+      - build-essential
+      - software-properties-common
+      - dnsmasq
+      - fontconfig
+      - git
+      - htop
+      - libcrypto++-dev
+      - libfreetype6-dev
+      - liblcms2-dev
+      - libssl-dev
+      - libwebp-dev
+      - libxext6
+      - libxrender1
+      - libxslt1-dev
+      - libxslt1.1
+      - libffi-dev
+      - ntp
+      - postfix
+      - python-dev
+      - python-pip
+      - python-tk
+      - redis-server
+      - screen
+      - supervisor
+      - vim
+      - xfonts-75dpi
+      - xfonts-base
+      - zlib1g-dev
+      - apt-transport-https
+      - libsasl2-dev
+      - libldap2-dev
+      - libjpeg8-dev
+    when: ansible_os_family == 'Debian' or ansible_distribution == 'Ubuntu'
+
+  - include: ubuntu.yml
+    when: ansible_distribution == 'Ubuntu'
+
+  - include: debian.yml
+    when: ansible_os_family == 'Debian'
+
+  # Prerequisite for MACOS
+  - name: install prequisites for macos
+    homebrew: name={{ item }} state=present
+    with_items:
+      - cmake
+      - redis
+      - mariadb
+      - nodejs
+    when: ansible_distribution == 'MacOSX'