Merge pull request #728 from johanneswuerbach/fix-prod-registry

fix(registry): Use cache host and port from confd

Author: Matthew Fisher

registry/templates/config.yml

@@ -27,23 +27,18 @@ dev:
 # $ export SETTINGS_FLAVOR=prod
 prod:
     storage: s3
-    storage_path: "_env:STORAGE_PATH:/prod"
+    storage_path: /data
     # Amazon S3 Storage Configuration
     s3_access_key: {{ .deis_registry_s3accessKey }}
     s3_secret_key: {{ .deis_registry_s3secretKey }}
     s3_bucket: {{ .deis_registry_s3bucket }}
     s3_encrypt: {{ .deis_registry_s3encrypt }}
     s3_secure: {{ .deis_registry_s3secure }}
-    # Enabling LRU cache for small files. This speeds up read/write on small files
-    # when using a remote storage backend (like S3).
+    # Enabling query cache on Redis
     cache:
-        host: _env:CACHE_REDIS_HOST
-        port: _env:CACHE_REDIS_PORT
-        password: _env:CACHE_REDIS_PASSWORD
-    cache_lru:
-        host: _env:CACHE_LRU_REDIS_HOST
-        port: _env:CACHE_LRU_REDIS_PORT
-        password: _env:CACHE_LRU_REDIS_PASSWORD
+        host: {{ .deis_cache_host }}
+        port: {{ .deis_cache_port }}
+        db: 1
     # Enabling these options makes the Registry send an email on each code Exception
     email_exceptions:
         smtp_host: {{ .deis_registry_smtpHost }}