Merge pull request #855 from RuriRyan/dev

Adds support for redis sentinel deployments
Netflix · Dec 11, 2018 · e463757 · e463757
2 parents b9ee6e3 + ae12ab0
commit e463757
Show file tree

Hide file tree

Showing 8 changed files with 2,397 additions and 4 deletions.
diff --git a/core/src/main/java/com/netflix/conductor/core/config/Configuration.java b/core/src/main/java/com/netflix/conductor/core/config/Configuration.java
@@ -212,6 +212,6 @@ default List<AbstractModule> getAdditionalModules() {
 
 
     enum DB {
-        REDIS, DYNOMITE, MEMORY, REDIS_CLUSTER, MYSQL
+        REDIS, DYNOMITE, MEMORY, REDIS_CLUSTER, MYSQL, REDIS_SENTINEL
     }
 }
diff --git a/docs/docs/server/index.md b/docs/docs/server/index.md
@@ -58,6 +58,7 @@ log4j.properties file path is optional and allows finer control over the logging
 # memory : The data is stored in memory and lost when the server dies.  Useful for testing or demo
 # redis : non-Dynomite based redis instance
 # redis_cluster: AWS Elasticache Redis (cluster mode enabled).See [http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/Clusters.Create.CON.RedisCluster.html]
+# redis_sentinel: Redis HA with Redis Sentinel. See [https://redis.io/topics/sentinel]
 # dynomite : Dynomite cluster.  Use this for HA configuration.
 db=dynomite
 
@@ -109,7 +110,7 @@ Conductor server can be used with a standlone Redis or ElastiCache server.  To c
 ```properties
 db=redis
 
-# For AWS Elasticache Redis (cluster mode enabled) the format is configuration_endpoint:port:us-east-1e. 
+# For AWS Elasticache Redis (cluster mode enabled) the format is configuration_endpoint:port:us-east-1e.
 # The region in this case does not matter
 workflow.dynomite.cluster.hosts=server_address:server_port:us-east-1e
 workflow.dynomite.connection.maxConnsPerHost=31