Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115174

Change subject: contint: get redis under /mnt/redis
......................................................................

contint: get redis under /mnt/redis

The redis class takes care of creating the directory so we do not need a
symlink from /var/lib/redis to /mnt/redis. That even produce a duplicate
definition error:

 File[/var/lib/redis] is already defined in file
/etc/puppet/manifests/role/ci.pp at line 275;
cannot redefine at /etc/puppet/modules/redis/manifests/init.pp:38

Change-Id: Ia5ce396795f1d1d0fb8de572c1bee558a712f34b
---
M manifests/role/ci.pp
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/115174/1

diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index f1eacfa..c40c65f 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -265,22 +265,13 @@
   }
 
   # For CirrusSearch testing:
-  file { '/mnt/redis':
-    ensure => 'directory',
-  }
-  file { '/var/lib/redis':
-    ensure  => 'link',
-    require => '/mnt/redis',
-    target  => '/mnt/redis',
-  }
   class { '::redis':
     maxmemory                 => '128mb',
     persist                   => 'aof',
     redis_replication         => undef,
     password                  => 'notsecure',
-    dir                       => '/var/lib/redis',
+    dir                       => '/mnt/redis',
     auto_aof_rewrite_min_size => '32mb',
-    require                   => File['/var/lib/redis'],
   }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/115174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5ce396795f1d1d0fb8de572c1bee558a712f34b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to