From c96fe5470f1dddd01fb5468140f95f76c99133ef Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Wed, 4 Jul 2018 23:26:40 +0200
Subject: [PATCH 1/6] force the creation of odoo_workdir and odoo_rootdir

---
 tasks/install.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tasks/install.yml b/tasks/install.yml
index fcca158..6e7b4e0 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -62,6 +62,14 @@
   tags:
     - odoo_project
 
+- name: Create working dir directory
+  file: path={{ odoo_workdir }} state=directory
+        owner={{ odoo_user }} group={{ odoo_user }} force=yes
+
+- name: Create odoo server directory
+  file: path={{ odoo_rootdir }} state=directory
+        owner={{ odoo_user }} group={{ odoo_user }} force=yes
+
 - name: Create odoo data dir directory
   file: path={{ odoo_config_data_dir }} state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=yes

From 0c6f02a4b8dcb3e0c70012c339405995c21d28af Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Thu, 5 Jul 2018 00:06:20 +0200
Subject: [PATCH 2/6] fixup!

---
 defaults/main.yml | 3 ++-
 tasks/install.yml | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c270c5c..b8df6d1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -39,7 +39,8 @@ odoo_postgresql_extensions:
     - unaccent
 
 # Standard installation/configuration options (odoo_install_type == 'standard')
-odoo_config_file: "/home/{{ odoo_user }}/{{ odoo_service }}.conf"
+odoo_config_file_dir: "/home/{{ odoo_user }}"
+odoo_config_file: "{{ odoo_config_file_dir }}/{{ odoo_service }}.conf"
 odoo_force_config: True
 odoo_config_addons_path:
     - "/home/{{ odoo_user }}/odoo/server/{{ (odoo_version | int) < 10 and 'openerp' or 'odoo' }}/addons"
diff --git a/tasks/install.yml b/tasks/install.yml
index 6e7b4e0..7287b5c 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -69,6 +69,14 @@
 - name: Create odoo server directory
   file: path={{ odoo_rootdir }} state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=yes
+  when: odoo_install_type != 'pip'
+  tags:
+    - odoo_install_type_standard
+    - odoo_install_type_buildout
+
+- name: Create odoo config file directory
+  file: path={{ odoo_config_file_dir }} state=directory
+        owner={{ odoo_user }} group={{ odoo_user }} force=yes
 
 - name: Create odoo data dir directory
   file: path={{ odoo_config_data_dir }} state=directory

From 4a4e683c34c9ca8c0ee0b9b2080a5456fb9febaa Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Thu, 5 Jul 2018 15:03:06 +0200
Subject: [PATCH 3/6] renames

---
 defaults/main.yml               |  6 +++---
 tasks/install.yml               | 14 +++++++++-----
 templates/odoo-10.0.init        |  2 +-
 templates/odoo-8.0.init         |  2 +-
 templates/odoo-9.0.init         |  2 +-
 templates/odoo-standard.service |  4 ++--
 vars/Ubuntu-16_Odoo-11.yml      |  2 +-
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index b8df6d1..cd3c033 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,10 +12,10 @@ odoo_init: True
 odoo_init_env: {}
     #VAR1: value1
     #VAR2: value2
-odoo_logdir: "/var/log/{{ odoo_user }}"
+odoo_logdir: "/var/log"
 odoo_logfile: "{{ ansible_service_mgr != 'systemd' and ('/'.join([odoo_logdir, odoo_service]) + '.log') or ''}}"
-odoo_workdir: "/home/{{ odoo_user }}/odoo"
-odoo_rootdir: "{{ odoo_install_type == 'buildout' and '/home/'+odoo_user+'/odoo/parts/odoo' or '/home/'+odoo_user+'/odoo/server' }}"
+odoo_workdir: "/home/{{ odoo_user }}/{{ odoo_service }}"
+odoo_rootdir: "{{ '/home/'+odoo_user+'/'+odoo_service }}"
 
 # Project repository to deploy
 odoo_repo_type: git     # git or hg
diff --git a/tasks/install.yml b/tasks/install.yml
index 7287b5c..899f29f 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -25,7 +25,7 @@
     - odoo_install_ssh
 
 - name: Create log directory
-  file: path={{ odoo_logdir }} state=directory
+  file: path={{ odoo_logdir }}/{{ odoo_service }} state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=no
   tags:
     - odoo_log
@@ -63,11 +63,11 @@
     - odoo_project
 
 - name: Create working dir directory
-  file: path={{ odoo_workdir }} state=directory
+  file: path={{ odoo_workdir }}/{{ odoo_service }} state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=yes
 
 - name: Create odoo server directory
-  file: path={{ odoo_rootdir }} state=directory
+  file: path={{ odoo_rootdir }}/{{ odoo_service }} state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=yes
   when: odoo_install_type != 'pip'
   tags:
@@ -75,11 +75,15 @@
     - odoo_install_type_buildout
 
 - name: Create odoo config file directory
-  file: path={{ odoo_config_file_dir }} state=directory
+  file: path={{ odoo_config_file_dir }}/{{ odoo_service }} state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=yes
+  when: odoo_install_type != 'buildout'
+  tags:
+    - odoo_install_type_pip
+    - odoo_install_type_standard
 
 - name: Create odoo data dir directory
-  file: path={{ odoo_config_data_dir }} state=directory
+  file: path={{ odoo_config_data_dir }}/{{ odoo_service }} state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=yes
   when: odoo_install_type != 'buildout'
   tags:
diff --git a/templates/odoo-10.0.init b/templates/odoo-10.0.init
index 1b9a7a7..140bf81 100644
--- a/templates/odoo-10.0.init
+++ b/templates/odoo-10.0.init
@@ -16,7 +16,7 @@
 
 PATH=/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 WORKDIR={{ odoo_workdir }}
-DAEMON={{ odoo_rootdir }}/odoo-bin
+DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/odoo-bin
 NAME={{ odoo_service }}
 DESC={{ odoo_service }}
 CONFIG={{ odoo_config_file }}
diff --git a/templates/odoo-8.0.init b/templates/odoo-8.0.init
index 322e1a8..acb2766 100644
--- a/templates/odoo-8.0.init
+++ b/templates/odoo-8.0.init
@@ -16,7 +16,7 @@
 
 PATH=/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 WORKDIR={{ odoo_workdir }}
-DAEMON={{ odoo_rootdir }}/odoo.py
+DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/odoo.py
 NAME={{ odoo_service }}
 DESC={{ odoo_service }}
 CONFIG={{ odoo_config_file }}
diff --git a/templates/odoo-9.0.init b/templates/odoo-9.0.init
index 322e1a8..acb2766 100644
--- a/templates/odoo-9.0.init
+++ b/templates/odoo-9.0.init
@@ -16,7 +16,7 @@
 
 PATH=/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 WORKDIR={{ odoo_workdir }}
-DAEMON={{ odoo_rootdir }}/odoo.py
+DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/odoo.py
 NAME={{ odoo_service }}
 DESC={{ odoo_service }}
 CONFIG={{ odoo_config_file }}
diff --git a/templates/odoo-standard.service b/templates/odoo-standard.service
index e4ad3e7..fa69c85 100644
--- a/templates/odoo-standard.service
+++ b/templates/odoo-standard.service
@@ -7,10 +7,10 @@ Type=simple
 User={{ odoo_user }}
 WorkingDirectory={{ odoo_workdir }}
 {% if odoo_version | version_compare('10.0', '>=') %}
-ExecStart={{ odoo_rootdir }}/odoo-bin{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
+ExecStart={{ odoo_rootdir }}/{{ odoo_service }}/odoo-bin{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
 KillMode=mixed
 {% else %}
-ExecStart={{ odoo_rootdir }}/odoo.py{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
+ExecStart={{ odoo_rootdir }}/{{ odoo_service }}/odoo.py{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
 {% endif %}
 {% for name, value in odoo_init_env.iteritems() %}
 Environment={{ name }}={{ value }}
diff --git a/vars/Ubuntu-16_Odoo-11.yml b/vars/Ubuntu-16_Odoo-11.yml
index 890ceec..5a73a61 100644
--- a/vars/Ubuntu-16_Odoo-11.yml
+++ b/vars/Ubuntu-16_Odoo-11.yml
@@ -96,7 +96,7 @@ odoo_buildout_build_dependencies:
     - libwebp-dev
 
 odoo_buildout_venv_cmd: "virtualenv --no-setuptools --python=python3 {{ odoo_buildout_venv_path }}"
-odoo_pip_venv_cmd: "virtualenv --python=python3 {{ odoo_pip_venv_path }}"
+º: "virtualenv --python=python3 {{ odoo_pip_venv_path }}"
 
 odoo_wkhtmltox_version: 0.12.4
 

From af4ef6df462f77e8875ff7eb8884293f322459b7 Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Thu, 5 Jul 2018 15:08:46 +0200
Subject: [PATCH 4/6] fixup!

---
 tasks/install.yml               | 2 +-
 templates/odoo-10.0.init        | 2 +-
 templates/odoo-8.0.init         | 2 +-
 templates/odoo-9.0.init         | 2 +-
 templates/odoo-standard.service | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tasks/install.yml b/tasks/install.yml
index 899f29f..d6567c6 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -67,7 +67,7 @@
         owner={{ odoo_user }} group={{ odoo_user }} force=yes
 
 - name: Create odoo server directory
-  file: path={{ odoo_rootdir }}/{{ odoo_service }} state=directory
+  file: path={{ odoo_rootdir }}/{{ odoo_service }}/server state=directory
         owner={{ odoo_user }} group={{ odoo_user }} force=yes
   when: odoo_install_type != 'pip'
   tags:
diff --git a/templates/odoo-10.0.init b/templates/odoo-10.0.init
index 140bf81..e39c6a1 100644
--- a/templates/odoo-10.0.init
+++ b/templates/odoo-10.0.init
@@ -16,7 +16,7 @@
 
 PATH=/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 WORKDIR={{ odoo_workdir }}
-DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/odoo-bin
+DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/server/odoo-bin
 NAME={{ odoo_service }}
 DESC={{ odoo_service }}
 CONFIG={{ odoo_config_file }}
diff --git a/templates/odoo-8.0.init b/templates/odoo-8.0.init
index acb2766..32f738a 100644
--- a/templates/odoo-8.0.init
+++ b/templates/odoo-8.0.init
@@ -16,7 +16,7 @@
 
 PATH=/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 WORKDIR={{ odoo_workdir }}
-DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/odoo.py
+DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/server/odoo.py
 NAME={{ odoo_service }}
 DESC={{ odoo_service }}
 CONFIG={{ odoo_config_file }}
diff --git a/templates/odoo-9.0.init b/templates/odoo-9.0.init
index acb2766..32f738a 100644
--- a/templates/odoo-9.0.init
+++ b/templates/odoo-9.0.init
@@ -16,7 +16,7 @@
 
 PATH=/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 WORKDIR={{ odoo_workdir }}
-DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/odoo.py
+DAEMON={{ odoo_rootdir }}/{{ odoo_service }}/server/odoo.py
 NAME={{ odoo_service }}
 DESC={{ odoo_service }}
 CONFIG={{ odoo_config_file }}
diff --git a/templates/odoo-standard.service b/templates/odoo-standard.service
index fa69c85..3f4f819 100644
--- a/templates/odoo-standard.service
+++ b/templates/odoo-standard.service
@@ -7,10 +7,10 @@ Type=simple
 User={{ odoo_user }}
 WorkingDirectory={{ odoo_workdir }}
 {% if odoo_version | version_compare('10.0', '>=') %}
-ExecStart={{ odoo_rootdir }}/{{ odoo_service }}/odoo-bin{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
+ExecStart={{ odoo_rootdir }}/{{ odoo_service }}/server/odoo-bin{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
 KillMode=mixed
 {% else %}
-ExecStart={{ odoo_rootdir }}/{{ odoo_service }}/odoo.py{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
+ExecStart={{ odoo_rootdir }}/{{ odoo_service }}/server/odoo.py{{ odoo_logfile and ' --logfile %s' % odoo_logfile }} --config {{ odoo_config_file }}
 {% endif %}
 {% for name, value in odoo_init_env.iteritems() %}
 Environment={{ name }}={{ value }}

From 2f7be352e444d4122f3559366e56c5a42b9fcce9 Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Thu, 5 Jul 2018 15:21:30 +0200
Subject: [PATCH 5/6] fixup!

---
 .idea/workspace.xml | 314 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 314 insertions(+)
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..2a89180
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="032e6d03-733e-4eed-b56a-ee41842fe528" name="Default" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="install_pip.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="450">
+              <caret line="25" column="37" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="37" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="install.yml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/tasks/install.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="46">
+              <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="50" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="4068">
+              <caret line="226" column="30" selection-start-line="226" selection-start-column="27" selection-end-line="226" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tasks/main.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="15" column="7" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/defaults/main.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-576">
+              <caret line="4" column="12" selection-start-line="4" selection-end-line="4" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>odoo_config_syslog</find>
+      <find>odoo_config_logfile</find>
+      <find>log</find>
+      <find>odoo_logdir</find>
+      <find>not in</find>
+      <find>requirements</find>
+      <find>virtualenv</find>
+      <find>odoo_config_file</find>
+      <find>odoo</find>
+      <find>odoo_service</find>
+      <find>odoo_rootdir</find>
+    </findStrings>
+    <dirStrings>
+      <dir>$PROJECT_DIR$</dir>
+    </dirStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master" />
+      </map>
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/tasks/install_pip.yml" />
+        <option value="$PROJECT_DIR$/defaults/main.yml" />
+        <option value="$PROJECT_DIR$/tasks/install.yml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="64" />
+    <option name="y" value="-11" />
+    <option name="width" value="1857" />
+    <option name="height" value="1092" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
+              <item name="defaults" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
+              <item name="tasks" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
+              <item name="vars" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="032e6d03-733e-4eed-b56a-ee41842fe528" name="Default" comment="" />
+      <created>1529570838166</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1529570838166</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="65" y="-4" width="1855" height="1084" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959569" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Python Console" order="7" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Messages" order="7" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="25" column="37" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/install.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1422">
+          <caret line="79" selection-start-line="79" selection-end-line="79" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/main.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="15" column="7" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/defaults/main.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="774">
+          <caret line="43" column="23" lean-forward="true" selection-start-line="43" selection-start-column="23" selection-end-line="43" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="684">
+          <caret line="38" column="5" selection-start-line="38" selection-start-column="2" selection-end-line="38" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/install.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1872">
+          <caret line="104" lean-forward="true" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="738">
+          <caret line="41" column="28" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4068">
+          <caret line="226" column="30" selection-start-line="226" selection-start-column="27" selection-end-line="226" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/odoo-11.0.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="648">
+          <caret line="36" column="32" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/odoo-buildout.service">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="8" column="58" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/odoo-11.0.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="648">
+          <caret line="36" column="32" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/odoo-buildout.service">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="8" column="58" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="25" column="37" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/main.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="15" column="7" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/defaults/main.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-576">
+          <caret line="4" column="12" selection-start-line="4" selection-end-line="4" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4068">
+          <caret line="226" column="30" selection-start-line="226" selection-start-column="27" selection-end-line="226" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tasks/install.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file

From 3da087aa61afbd6aa538e6e8ccdecfe2fac35568 Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Thu, 5 Jul 2018 15:25:08 +0200
Subject: [PATCH 6/6] fixup!

---
 .idea/workspace.xml | 314 --------------------------------------------
 defaults/main.yml   |   4 +-
 2 files changed, 2 insertions(+), 316 deletions(-)
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 2a89180..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="032e6d03-733e-4eed-b56a-ee41842fe528" name="Default" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="install_pip.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="25" column="37" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="install.yml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/tasks/install.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="46">
-              <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="50" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4068">
-              <caret line="226" column="30" selection-start-line="226" selection-start-column="27" selection-end-line="226" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tasks/main.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="15" column="7" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/defaults/main.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-576">
-              <caret line="4" column="12" selection-start-line="4" selection-end-line="4" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>odoo_config_syslog</find>
-      <find>odoo_config_logfile</find>
-      <find>log</find>
-      <find>odoo_logdir</find>
-      <find>not in</find>
-      <find>requirements</find>
-      <find>virtualenv</find>
-      <find>odoo_config_file</find>
-      <find>odoo</find>
-      <find>odoo_service</find>
-      <find>odoo_rootdir</find>
-    </findStrings>
-    <dirStrings>
-      <dir>$PROJECT_DIR$</dir>
-    </dirStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/tasks/install_pip.yml" />
-        <option value="$PROJECT_DIR$/defaults/main.yml" />
-        <option value="$PROJECT_DIR$/tasks/install.yml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="64" />
-    <option name="y" value="-11" />
-    <option name="width" value="1857" />
-    <option name="height" value="1092" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
-              <item name="defaults" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ansible-odoo" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ansible-odoo" type="462c0819:PsiDirectoryNode" />
-              <item name="vars" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="032e6d03-733e-4eed-b56a-ee41842fe528" name="Default" comment="" />
-      <created>1529570838166</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1529570838166</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="65" y="-4" width="1855" height="1084" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959569" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Python Console" order="7" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Messages" order="7" />
-    </layout>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="25" column="37" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/install.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1422">
-          <caret line="79" selection-start-line="79" selection-end-line="79" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/main.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="7" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/defaults/main.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="774">
-          <caret line="43" column="23" lean-forward="true" selection-start-line="43" selection-start-column="23" selection-end-line="43" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="684">
-          <caret line="38" column="5" selection-start-line="38" selection-start-column="2" selection-end-line="38" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/install.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1872">
-          <caret line="104" lean-forward="true" selection-end-line="104" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="738">
-          <caret line="41" column="28" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4068">
-          <caret line="226" column="30" selection-start-line="226" selection-start-column="27" selection-end-line="226" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/odoo-11.0.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="648">
-          <caret line="36" column="32" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/odoo-buildout.service">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="58" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/odoo-11.0.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="648">
-          <caret line="36" column="32" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/odoo-buildout.service">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="58" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/install_pip.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="25" column="37" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/main.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="7" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/defaults/main.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-576">
-          <caret line="4" column="12" selection-start-line="4" selection-end-line="4" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4068">
-          <caret line="226" column="30" selection-start-line="226" selection-start-column="27" selection-end-line="226" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tasks/install.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/defaults/main.yml b/defaults/main.yml
index cd3c033..f8663de 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -107,13 +107,13 @@ odoo_config_custom: {}
     #your_option2: value2
 
 # Pip installation options (odoo_install_type == 'pip')
-odoo_pip_venv_path: "{{ odoo_workdir }}/sandbox"
+odoo_pip_venv_path: "{{ odoo_workdir }}/{{ odoo_service }}/sandbox"
 odoo_pip_requirements_url: "file:///home/{{ odoo_user }}/requirements.txt"
 odoo_pip_odoo_bin_path: "{{ odoo_pip_venv_path }}/bin/{{ (odoo_version | int) < 10 and 'odoo.py' or 'odoo' }}"
 
 # Buildout installation options (odoo_install_type == 'buildout')
 odoo_buildout_version: 2.10.0
-odoo_buildout_venv_path: "{{ odoo_workdir }}/sandbox"
+odoo_buildout_venv_path: "{{ odoo_workdir }}/{{ odoo_service }}/sandbox"
 odoo_buildout_bootstrap_path: "{{ odoo_workdir }}/bootstrap.py"
 odoo_buildout_bootstrap_cmd: "{{ odoo_buildout_venv_path }}/bin/python {{ odoo_buildout_bootstrap_path }} -c {{ odoo_buildout_config_path }} --buildout-version {{ odoo_buildout_version }}"
 odoo_buildout_bin_path: "{{ odoo_workdir }}/bin/buildout"