ref(controller): remove redis cache library and settings

mboersma · mboersma · commit d520bba944b2 · 2014-12-26T11:08:58.000-07:00
CACHE_URL and the python Redis library were not actually being
used by the controller.
diff --git a/conf.d/confd_settings.toml b/conf.d/confd_settings.toml
@@ -6,7 +6,6 @@ gid = 1000
 mode  = "0640"
 keys = [
   "/deis/controller",
-  "/deis/cache",
   "/deis/database",
   "/deis/registry",
   "/deis/domains",
diff --git a/requirements.txt b/requirements.txt
@@ -16,6 +16,5 @@ paramiko==1.14.1
 psycopg2==2.5.4
 python-etcd==0.3.2
 PyYAML==3.11
-redis==2.9.1
 static==1.0.2
 South==1.0.1
diff --git a/templates/confd_settings.py b/templates/confd_settings.py
@@ -34,9 +34,6 @@
     }
 }
 
-# configure cache
-CACHE_URL = 'redis://{{ .deis_cache_host }}:{{ .deis_cache_port }}/0'
-
 # move log directory out of /app/deis
 DEIS_LOG_DIR = '/data/logs'
 
diff --git a/tests/controller_test.go b/tests/controller_test.go
@@ -17,13 +17,10 @@ func TestController(t *testing.T) {
 		"/deis/registry/protocol",
 		"/deis/registry/host",
 		"/deis/registry/port",
-		"/deis/cache/host",
-		"/deis/cache/port",
 		"/deis/platform/domain",
 	}
 	setdir := []string{
 		"/deis/controller",
-		"/deis/cache",
 		"/deis/database",
 		"/deis/registry",
 		"/deis/domains",

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,6 @@`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-# configure cache`
`38`		`-CACHE_URL = 'redis://{{ .deis_cache_host }}:{{ .deis_cache_port }}/0'`
`39`		`-`
`40`	`37`	`# move log directory out of /app/deis`
`41`	`38`	`DEIS_LOG_DIR = '/data/logs'`
`42`	`39`