Merge pull request #88 from NeatNerdPrime/add-odoo-18-support

REFERENCE.md

@@ -116,7 +116,7 @@ The following parameters are available in the `odoo` class:
 
 ##### <a name="-odoo--version"></a>`version`
 
-Data type: `Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', 'system']`
+Data type: `Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', '18.0', 'system']`
 
 The version of odoo to install
 

manifests/dependencies.pp

@@ -41,7 +41,7 @@
               $odoo_pip_packages = {}
             }
             default: {
-              warning("Please contribute support for ubuntu ${facts.get('os.release.full')}")
+              warning("Please contribute support for Debian ${facts.get('os.release.full')}")
               $odoo_dependencies = []
               $odoo_pip_packages = {}
             }

manifests/init.pp

@@ -80,7 +80,7 @@
 # @param limit_time_real_cron Maximum allowed Real time per cron job
 # @param limit_request Maximum number of request to be processed per worker
 class odoo (
-  Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', 'system'] $version = undef,
+  Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', '18.0', 'system'] $version = undef,
 
   String[1]                   $wkhtmltox_version = undef,
   Optional[Enum['wkhtmltox']] $wkhtmltopdf = undef,
@@ -195,7 +195,7 @@
   $odoo_supported_versions = {
     'Debian' => {
       '11' => ['14.0', '15.0', '16.0', 'system'],
-      '12' => ['14.0', '15.0', '16.0', '17.0'],
+      '12' => ['14.0', '15.0', '16.0', '17.0', '18.0'],
     },
     'Ubuntu' => {
       '20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],

manifests/repo.pp

@@ -8,11 +8,12 @@
     case $facts.get('os.family') {
       'debian': {
         apt::source { 'odoo':
-          location => "http://nightly.odoo.com/${odoo::version}/nightly/deb/",
+          location => "https://nightly.odoo.com/${odoo::version}/nightly/deb/",
           release  => '',
           repos    => './',
           key      => {
-            id => '5D134C924CB06330DCEFE2A1DEF2A2198183CBB5',
+            name   => 'odoo.key',
+            source => 'https://nightly.odoo.com/odoo.key',
           },
           include  => {
             src => false,

spec/acceptance/odoo_spec.rb

@@ -6,7 +6,7 @@ def odoo_supported_versions
   {
     'Debian' => {
       '11' => ['14.0', '15.0', '16.0', 'system'],
-      '12' => ['14.0', '15.0', '16.0', '17.0'],
+      '12' => ['14.0', '15.0', '16.0', '17.0', '18.0'],
     },
     'Ubuntu' => {
       '20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],