Fixing managed_dir_path condition

Author: pmcmaw

manifests/server/managed_dirs.pp

@@ -32,7 +32,7 @@
     $logbindir = dirname($logbin)
 
     #Stop puppet from managing directory if just a filename/prefix is specified or is not already managed
-    if ($logbindir != '.' and !($logbindir in $managed_dirs_path)) {
+    if ($logbindir != '.' or !($logbindir in $managed_dirs_path)) {
       file { $logbindir:
         ensure => directory,
         mode   => '0700',

spec/acceptance/mysql_server_spec.rb

@@ -51,20 +51,17 @@ class { 'mysql::server':
       let(:pp) do
         <<-MANIFEST
         class { '::mysql::server':
-        root_password           => 'strongpassword',
-        remove_default_accounts => true,
-        restart                 => true,
         override_options => {
                   'mysqld' => {
                   'log-bin' => '/var/log/mariadb/mariadb-bin.log',}
            }
           }
           MANIFEST
-        end
+      end
 
-        it 'can be set' do
-          apply_manifest(pp, catch_failures: true) do |r|
-            expect(r.stderr).to be_empty
+      it 'can be set' do
+        apply_manifest(pp, catch_failures: true) do |r|
+          expect(r.stderr).to be_empty
         end
       end
     end