From c7aef8a75a88241c716396f79ab2daa9d4d7914c Mon Sep 17 00:00:00 2001 From: smit thakkar Date: Mon, 10 Jul 2017 11:40:01 +0530 Subject: [PATCH 1/4] Tried to wrap some todos - Modified the code to create fstat user before we start everything - Added task to create fstat user - Added task to create virtualenv and pull/clone fstat code - Added task to install dependencies if requirements file is updated --- roles/fstat/tasks/main.yml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/roles/fstat/tasks/main.yml b/roles/fstat/tasks/main.yml index 4a872309..8e875088 100644 --- a/roles/fstat/tasks/main.yml +++ b/roles/fstat/tasks/main.yml @@ -1,17 +1,35 @@ --- +- user: name={{user}} + sudo: yes + - name: Install required packages - package: + yum: state: present name: "{{ item }}" with_items: - - python-virtualenv - - gcc - - git + - python-virtualenv + - gcc + - git -# TODO create the directory /fstat, do the git checkout -# automate update -# set configuration file, and database creation +# TODO set configuration file, and database creation # and selinux boolean + +- name: create fstat directory + file: path=/fstat/code state=directory + +- name: create virtualenv if it does not exists + command: virtualenv /fstat/venv + +- name: clone or update fstat repo + git: + repo: https://github.com/gluster/fstat + dest: /fstat/code + +- name: install dependencies + pip: + requirements=/fstat/code/requirements.txt + virtualenv=/fstat/venv + - name: Add tmpfiles snippet template: dest: /etc/tmpfiles.d/fstat.conf @@ -37,7 +55,7 @@ name: fstat {{item.name}} minute: "0" hour: "1" - job: "/fstat/env/bin/python /fstat/code/manage.py process_jobs -n 3 -j {{item.job}}" + job: "/fstat/venv/bin/python /fstat/code/manage.py process_jobs -n 3 -j {{item.job}}" with_items: - { name: 'centos', job: 'centos6-regression' } - { name: 'netbsd', job: 'netbsd7-regression' } From b88c89f72e4bc74bcd07bff3e3ca1e626969d69d Mon Sep 17 00:00:00 2001 From: smit thakkar Date: Tue, 11 Jul 2017 12:04:35 +0530 Subject: [PATCH 2/4] Made the requested changes --- roles/fstat/tasks/main.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/roles/fstat/tasks/main.yml b/roles/fstat/tasks/main.yml index 8e875088..07be521a 100644 --- a/roles/fstat/tasks/main.yml +++ b/roles/fstat/tasks/main.yml @@ -1,9 +1,9 @@ --- -- user: name={{user}} - sudo: yes +- user: + name: "{{user}}" - name: Install required packages - yum: + package: state: present name: "{{ item }}" with_items: @@ -15,10 +15,16 @@ # and selinux boolean - name: create fstat directory - file: path=/fstat/code state=directory + file: + path: /fstat/code state=directory + +- name: Check if virtualenv exists + local_action: stat path=/fstat/venv + register: venv - name: create virtualenv if it does not exists command: virtualenv /fstat/venv + when: not venv.stat.exists - name: clone or update fstat repo git: From fa34cc42d9fdc420261094b9ffa40a4c56f43f58 Mon Sep 17 00:00:00 2001 From: smit thakkar Date: Tue, 25 Jul 2017 14:11:54 +0530 Subject: [PATCH 3/4] Update main.yml --- roles/fstat/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/fstat/tasks/main.yml b/roles/fstat/tasks/main.yml index 07be521a..36bac80e 100644 --- a/roles/fstat/tasks/main.yml +++ b/roles/fstat/tasks/main.yml @@ -19,12 +19,12 @@ path: /fstat/code state=directory - name: Check if virtualenv exists - local_action: stat path=/fstat/venv - register: venv + local_action: stat path=/fstat/env + register: env - name: create virtualenv if it does not exists - command: virtualenv /fstat/venv - when: not venv.stat.exists + command: virtualenv /fstat/env + when: not env.stat.exists - name: clone or update fstat repo git: @@ -34,7 +34,7 @@ - name: install dependencies pip: requirements=/fstat/code/requirements.txt - virtualenv=/fstat/venv + virtualenv=/fstat/env - name: Add tmpfiles snippet template: @@ -61,7 +61,7 @@ name: fstat {{item.name}} minute: "0" hour: "1" - job: "/fstat/venv/bin/python /fstat/code/manage.py process_jobs -n 3 -j {{item.job}}" + job: "/fstat/env/bin/python /fstat/code/manage.py process_jobs -n 3 -j {{item.job}}" with_items: - { name: 'centos', job: 'centos6-regression' } - { name: 'netbsd', job: 'netbsd7-regression' } From fc7f9b58a8a71a5cd0fd9055272d89fe0fafd702 Mon Sep 17 00:00:00 2001 From: smit thakkar Date: Tue, 29 Aug 2017 12:21:20 +0530 Subject: [PATCH 4/4] made the requested changes --- roles/fstat/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/fstat/tasks/main.yml b/roles/fstat/tasks/main.yml index 36bac80e..fef5deb6 100644 --- a/roles/fstat/tasks/main.yml +++ b/roles/fstat/tasks/main.yml @@ -19,10 +19,11 @@ path: /fstat/code state=directory - name: Check if virtualenv exists - local_action: stat path=/fstat/env + stat: + path: /fstat/env register: env -- name: create virtualenv if it does not exists +- name: creates virtualenv if it does not exists command: virtualenv /fstat/env when: not env.stat.exists