3 files changed, 12 insertions, 10 deletions
diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp
index 8967f5b..4740d67 100644
--- a/manifests/profile/base/database/mongodb.pp
+++ b/manifests/profile/base/database/mongodb.pp
@@ -30,10 +30,15 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*memory_limit*]
+#   (Optional) Limit amount of memory mongodb can use
+#   Defaults to 20G
+#
 class tripleo::profile::base::database::mongodb (
   $mongodb_replset,
   $bootstrap_node = downcase(hiera('bootstrap_nodeid')),
   $step           = hiera('step'),
+  $memory_limit   = '20G',
 ) {
   if $step >= 2 {
 
@@ -56,5 +61,11 @@ class tripleo::profile::base::database::mongodb (
       }
     }
 
+    # Limit memory utilization
+    ::systemd::service_limits { 'mongod.service':
+      limits => {
+        'MemoryLimit' => $memory_limit
+      }
+    }
   }
 }
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 80b07d4..b4ac8ac 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -47,12 +47,6 @@
 #   limit for the mysql service.
 #   Defaults to false
 #
-# [*generate_service_certificates*]
-#   (Optional) Whether or not certmonger will generate certificates for
-#   MySQL. This could be as many as specified by the $certificates_specs
-#   variable.
-#   Defaults to hiera('generate_service_certificate', false).
-#
 # [*manage_resources*]
 #   (Optional) Whether or not manage root user, root my.cnf, and service.
 #   Defaults to true
@@ -82,7 +76,6 @@ class tripleo::profile::base::database::mysql (
   $certificate_specs             = {},
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $generate_dropin_file_limit    = false,
-  $generate_service_certificates = hiera('generate_service_certificates', false),
   $manage_resources              = true,
   $mysql_server_options          = {},
   $mysql_max_connections         = hiera('mysql_max_connections', undef),
@@ -100,9 +93,6 @@ class tripleo::profile::base::database::mysql (
   validate_hash($certificate_specs)
 
   if $enable_internal_tls {
-    if $generate_service_certificates {
-      ensure_resource('class', 'tripleo::certmonger::mysql', $certificate_specs)
-    }
     $tls_certfile = $certificate_specs['service_certificate']
     $tls_keyfile = $certificate_specs['service_key']
   } else {
diff --git a/manifests/profile/base/database/mysql/client.pp b/manifests/profile/base/database/mysql/client.pp
index 22384a9..014ef35 100644
--- a/manifests/profile/base/database/mysql/client.pp
+++ b/manifests/profile/base/database/mysql/client.pp
@@ -82,6 +82,7 @@ class tripleo::profile::base::database::mysql::client (
     # Create /etc/my.cnf.d/tripleo.cnf
     exec { 'directory-create-etc-my.cnf.d':
       command => 'mkdir -p /etc/my.cnf.d',
+      unless  => 'test -d /etc/my.cnf.d',
       path    => ['/usr/bin', '/usr/sbin', '/bin', '/sbin'],
     } ->
     augeas { 'tripleo-mysql-client-conf':