diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d1538..0eba1e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # locp-odoo +##2016-12-30 - Release 0.2.0 ([diff](https://github.com/locp/puppet-odoo/compare/0.1.2...0.2.0)) + +* Rename of the module from locp-odoo9 to locp-odoo. +* Now supports Odoo 10. +* Added support for CentOS 7. +* Implemented better acceptance tests. +* Specified that the licence is Apache 2. + ##2016-12-23 - Release 0.1.2 ([diff](https://github.com/locp/puppet-odoo/compare/0.1.1...0.1.2)) Announce that the module has been renamed from locp-odoo9 to locp-odoo. diff --git a/README.md b/README.md index f2b7087..86c709b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ## Description -Install Odoo 9 Communinty edition in a manner similar to that described in +Install Odoo Communinty edition in a manner similar to that described in *[Installing Odoo](https://www.odoo.com/documentation/9.0/setup/install.html)*. This module has now been renamed to locp-odoo. Please see the following: @@ -48,7 +48,7 @@ include ::odoo The following example will install a basic PostgreSQL database on the node (using `[puppetlabs-postgresql](https://forge.puppet.com/puppetlabs/postgresql)`) -it then configures the the Odoo repositories. It then installs the +it then configures the the Odoo 9 repositories. It then installs the `odoo` and `wkhtmltopdf` packages with some settings for the Odoo server: @@ -57,7 +57,7 @@ class { 'postgresql::server': before => Class['odoo'] } -class { '::odoo::repo': +class { '::odoo::repo9': before => Class['odoo'] } @@ -73,7 +73,33 @@ class { '::odoo': 'addons_path' => '/usr/lib/python2.7/dist-packages/openerp/addons', } }, - version => '9.0c.20161009', +} +``` + +To do the same for Odoo 10: + +```puppet +# +class { 'postgresql::server': + before => Class['odoo'] +} + +class { '::odoo::repo10': + before => Class['odoo'] +} + +class { '::odoo': + install_wkhtmltopdf => true, + settings => { + 'options' => { + 'admin_passwd' => 'XXX_TOP_SECRET_XXX', + 'db_host' => 'False', + 'db_port' => 'False', + 'db_user' => 'odoo', + 'db_password' => 'False', + 'addons_path' => '/usr/lib/python2.7/dist-packages/odoo/addons', + } + }, } ``` @@ -81,15 +107,16 @@ class { '::odoo': ### Public Classes -* [odoo9] - (http://locp.github.io/puppet-odoo/puppet_classes/odoo9.html) -* [odoo9::repo] - (http://locp.github.io/puppet-odoo/puppet_classes/odoo9_3A_3Arepo.html) +* [odoo] + (http://locp.github.io/puppet-odoo/puppet_classes/odoo.html) +* [odoo::repo9] + (http://locp.github.io/puppet-odoo/puppet_classes/odoo_3A_3Arepo9.html) +* [odoo::repo10] + (http://locp.github.io/puppet-odoo/puppet_classes/odoo_3A_3Arepo10.html) ## Limitations -At the moment this module has only been tested against Ubuntu 14. Also this -module does not in anyway configure PostgreSQL. +This module does not in anyway configure PostgreSQL. ## Development diff --git a/manifests/repo10.pp b/manifests/repo10.pp index d299606..a059455 100644 --- a/manifests/repo10.pp +++ b/manifests/repo10.pp @@ -1,5 +1,7 @@ # Install a repository to install an Odoo 10 package from. # +# @param ensure [absent | present] Ensure the the repository is either +# absent or present. # @param descr [string] A string to describe the repository. # @param key_id [string] The key for the Debian APT repository. This option # is ignored on the Red Hat family. diff --git a/manifests/repo9.pp b/manifests/repo9.pp index 95033db..febb817 100644 --- a/manifests/repo9.pp +++ b/manifests/repo9.pp @@ -1,5 +1,7 @@ # Install a repository to install an Odoo 9 package from. # +# @param ensure [absent | present] Ensure the the repository is either +# absent or present. # @param descr [string] A string to describe the repository. # @param key_id [string] The key for the Debian APT repository. This option is ignored on the Red Hat family. # @param key_url [string] A URL to the key for the Debian APT repository. This option is ignored on the Red Hat family. diff --git a/metadata.json b/metadata.json index e3cd118..f76bb9c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "locp-odoo", - "version": "0.1.2", + "version": "0.2.0", "author": "locp", "summary": "Puppet module to install Odoo Community.", "license": "Apache-2.0",