Merge branch 'main' into testing

manifests/app_type.pp

@@ -61,7 +61,7 @@ define sunetdrive::app_type (
     $php_memory_limit_mb = 512
   }
   if $::facts['dockerhost2'] == 'yes' {
-    $hostnet = 'yes'
+    $hostnet = true
   }
 
   # These are encrypted values from local.eyaml

manifests/proxysql.pp

@@ -27,7 +27,7 @@ class sunetdrive::proxysql (
 
   $transaction_persistent = 1
   if $::facts['dockerhost2'] == 'yes' {
-    $hostnet = 'yes'
+    $hostnet = true
   }
 
   file { '/usr/local/bin/proxysql':

templates/application/config.php.erb

@@ -127,6 +127,24 @@ $CONFIG = array (
     ],
     'timeout' => 1.1
   ],
+<% elsif @location == 'gss-prod' -%>
+  'redis.cluster' => [
+    'failover_mode' => \RedisCluster::FAILOVER_ERROR,
+    'password' => '<%= @redis_cluster_password %>',
+    'read_timeout' => 0.0,
+    'seeds' => [
+      'redis1.drive.sunet.se:6379',
+      'redis2.drive.sunet.se:6379',
+      'redis3.drive.sunet.se:6379',
+      'redis1.drive.sunet.se:6380',
+      'redis2.drive.sunet.se:6380',
+      'redis3.drive.sunet.se:6380',
+      'redis1.drive.sunet.se:6381',
+      'redis2.drive.sunet.se:6381',
+      'redis3.drive.sunet.se:6381'
+    ],
+    'timeout' => 1.1
+  ],
 <% elsif @environment == 'test' && ! @is_multinode -%>
   'redis.cluster' => [
     'failover_mode' => \RedisCluster::FAILOVER_ERROR,