Merge pull request #619 from root-expert/new-debian-ver

Add Debian 10 support

Author: bastelfreak

manifests/globals.pp

@@ -16,9 +16,14 @@
   $ipv6                  = undef,
   $bind_ip               = undef,
 
-  $version               = undef,
-
-  $manage_package_repo   = undef,
+  $version               = fact('os.distro.codename') ? { # Debian 10 doesn't provide mongodb 3.6.
+    'buster' => '4.4.8',
+    default  => undef
+  },
+  $manage_package_repo   = fact('os.distro.codename') ? { # Debian 10 doesn't provide mongodb packages. So manage it!
+    'buster' => true,
+    default  => undef
+  },
   $manage_package        = undef,
   $repo_proxy            = undef,
   $proxy_username        = undef,

metadata.json

@@ -23,7 +23,8 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9"
+        "9",
+        "10"
       ]
     },
     {

spec/acceptance/mongos_spec.rb

@@ -3,7 +3,11 @@
 describe 'mongodb::mongos class' do
   case fact('osfamily')
   when 'Debian'
-    package_name = 'mongodb-server'
+    package_name = if fact('os.distro.codename') =~ %r{^(buster|bullseye)$}
+                     'mongodb-org-server'
+                   else
+                     'mongodb-server'
+                   end
     config_file  = '/etc/mongodb-shard.conf'
   else
     package_name = 'mongodb-org-server'

spec/acceptance/server_spec.rb

@@ -3,9 +3,21 @@
 describe 'mongodb::server class' do
   case fact('osfamily')
   when 'Debian'
-    config_file = '/etc/mongodb.conf'
-    service_name = 'mongodb'
-    package_name = 'mongodb-server'
+    config_file = if fact('os.distro.codename') =~ %r{^(buster)$}
+                    '/etc/mongod.conf'
+                  else
+                    '/etc/mongodb.conf'
+                  end
+    service_name = if fact('os.distro.codename') =~ %r{^(buster)$}
+                     'mongod'
+                   else
+                     'mongodb'
+                   end
+    package_name = if fact('os.distro.codename') =~ %r{^(buster)$}
+                     'mongodb-org-server'
+                   else
+                     'mongodb-server'
+                   end
   else
     config_file = '/etc/mongod.conf'
     service_name = 'mongod'

spec/classes/client_spec.rb

@@ -7,7 +7,11 @@
 
       context 'with defaults' do
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to create_package('mongodb_client').with_ensure('present') }
+        if facts[:os]['release']['major'] =~ %r{(10)}
+          it { is_expected.to create_package('mongodb_client').with_ensure('4.4.8') }
+        else
+          it { is_expected.to create_package('mongodb_client').with_ensure('present') }
+        end
       end
 
       context 'with manage_package' do
@@ -16,7 +20,11 @@
         end
 
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to create_package('mongodb_client').with_ensure('present').with_name('mongodb-org-shell').with_tag('mongodb_package') }
+        if facts[:os]['release']['major'] =~ %r{(10)}
+          it { is_expected.to create_package('mongodb_client').with_ensure('4.4.8').with_name('mongodb-org-shell').with_tag('mongodb_package') }
+        else
+          it { is_expected.to create_package('mongodb_client').with_ensure('present').with_name('mongodb-org-shell').with_tag('mongodb_package') }
+        end
       end
     end
   end

spec/classes/mongos_spec.rb

@@ -7,7 +7,11 @@
 
       case facts[:os]['family']
       when 'Debian'
-        package_name = 'mongodb-server'
+        package_name = if facts[:os]['release']['major'] =~ %r{(10)}
+                         'mongodb-org-mongos'
+                       else
+                         'mongodb-server'
+                       end
         config_file  = '/etc/mongodb-shard.conf'
       else
         package_name = 'mongodb-org-mongos'
@@ -19,7 +23,11 @@
 
         # install
         it { is_expected.to contain_class('mongodb::mongos::install') }
-        it { is_expected.to contain_package('mongodb_mongos').with_ensure('present').with_name(package_name).with_tag('mongodb_package') }
+        if facts[:os]['release']['major'] =~ %r{(10)}
+          it { is_expected.to contain_package('mongodb_mongos').with_ensure('4.4.8').with_name(package_name).with_tag('mongodb_package') }
+        else
+          it { is_expected.to contain_package('mongodb_mongos').with_ensure('present').with_name(package_name).with_tag('mongodb_package') }
+        end
 
         # config
         it { is_expected.to contain_class('mongodb::mongos::config') }
@@ -79,7 +87,12 @@
         end
 
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('present').with_tag('mongodb_package') }
+
+        if facts[:os]['release']['major'] =~ %r{(10)}
+          it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('4.4.8').with_tag('mongodb_package') }
+        else
+          it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('present').with_tag('mongodb_package') }
+        end
       end
 
       context 'service_manage => false' do

spec/classes/server_spec.rb

@@ -20,7 +20,11 @@
 
       let(:config_file) do
         if facts[:os]['family'] == 'Debian'
-          '/etc/mongodb.conf'
+          if facts[:os]['release']['major'] =~ %r{(10)}
+            '/etc/mongod.conf'
+          else
+            '/etc/mongodb.conf'
+          end
         else
           '/etc/mongod.conf'
         end
@@ -39,6 +43,8 @@
 
         if facts[:os]['family'] == 'RedHat'
           it { is_expected.to contain_package('mongodb_server').with_ensure('present').with_name('mongodb-org-server').with_tag('mongodb_package') }
+        elsif facts[:os]['release']['major'] =~ %r{(10)}
+          it { is_expected.to contain_package('mongodb_server').with_ensure('4.4.8').with_name('mongodb-org-server').with_tag('mongodb_package') }
         else
           it { is_expected.to contain_package('mongodb_server').with_ensure('present').with_name('mongodb-server').with_tag('mongodb_package') }
         end
@@ -372,7 +378,7 @@
           let(:rsConf) do
             {
               'rsTest' => {
-                'ensure'  => 'present',
+                'ensure' => 'present',
                 'members' => [
                   'mongo1:27017',
                   'mongo2:27017',