Merge pull request #87 from sebalix/dev/odoo_user

[IMP+FIX] Set '*' as the default password for the Odoo user + Fix Buildout and pip install types
OCA · May 3, 2018 · 37dac54 · 37dac54
2 parents 31b3907 + 213b805
commit 37dac54
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -4,7 +4,9 @@ odoo_install_type: standard     # standard, buildout
 odoo_version: 11.0
 odoo_service: odoo
 odoo_user: odoo
-odoo_user_passwd: odoo
+odoo_user_passwd: "*"   # http://docs.ansible.com/ansible/latest/reference_appendices/faq.html#how-do-i-generate-crypted-passwords-for-the-user-module
+odoo_user_update_password: always
+odoo_user_shell: /bin/bash
 odoo_user_system: False
 odoo_init: True
 odoo_init_env: {}
@@ -109,7 +111,7 @@ 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.9.5
+odoo_buildout_version: 2.10.0
 odoo_buildout_venv_path: "{{ odoo_workdir }}/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 }}"

diff --git a/tasks/install.yml b/tasks/install.yml
@@ -10,9 +10,12 @@
     - odoo_required_tools
 
 - name: Add Odoo system user
-  user: name={{ odoo_user }} shell=/bin/bash
-        password={{ odoo_user_passwd }} update_password=on_create
-        system={{ odoo_user_system }}
+  user:
+    name: "{{ odoo_user }}"
+    shell: "{{ odoo_user_shell }}"
+    password: "{{ odoo_user_passwd }}"
+    update_password: "{{ odoo_user_update_password }}"
+    system: "{{ odoo_user_system }}"
   tags:
     - odoo_user
 

diff --git a/vars/Debian-8_Odoo-10.yml b/vars/Debian-8_Odoo-10.yml
@@ -55,6 +55,7 @@ odoo_npm_packages:
 odoo_pip_dependencies:
     - pip>=9.0.1
     - wrapt
+    - setuptools>=38.2.3
     - odoo-autodiscover==2.0.0
     - setuptools-odoo==2.0.2.post1
 

diff --git a/vars/Debian-8_Odoo-8.yml b/vars/Debian-8_Odoo-8.yml
@@ -42,6 +42,7 @@ odoo_npm_packages: []
 odoo_pip_dependencies:
     - pip>=9.0.1
     - wrapt
+    - setuptools>=38.2.3
     - odoo-autodiscover==2.0.0
     - setuptools-odoo==2.0.2.post1
 

diff --git a/vars/Debian-8_Odoo-9.yml b/vars/Debian-8_Odoo-9.yml
@@ -50,6 +50,7 @@ odoo_npm_packages:
 odoo_pip_dependencies:
     - pip>=9.0.1
     - wrapt
+    - setuptools>=38.2.3
     - odoo-autodiscover==2.0.0
     - setuptools-odoo==2.0.2.post1
 

diff --git a/vars/Ubuntu-14_Odoo-10.yml b/vars/Ubuntu-14_Odoo-10.yml
@@ -55,6 +55,7 @@ odoo_npm_packages:
 odoo_pip_dependencies:
     - pip>=9.0.1
     - wrapt
+    - setuptools>=38.2.3
     - odoo-autodiscover==2.0.0
     - setuptools-odoo==2.0.2.post1
 

diff --git a/vars/Ubuntu-14_Odoo-8.yml b/vars/Ubuntu-14_Odoo-8.yml
@@ -40,6 +40,7 @@ odoo_debian_packages:
 odoo_pip_dependencies:
     - pip>=9.0.1
     - wrapt
+    - setuptools>=38.2.3
     - odoo-autodiscover==2.0.0
     - setuptools-odoo==2.0.2.post1
 

diff --git a/vars/Ubuntu-14_Odoo-9.yml b/vars/Ubuntu-14_Odoo-9.yml
@@ -50,6 +50,7 @@ odoo_npm_packages:
 odoo_pip_dependencies:
     - pip>=9.0.1
     - wrapt
+    - setuptools>=38.2.3
     - odoo-autodiscover==2.0.0
     - setuptools-odoo==2.0.2.post1