Skip to content

Commit ec62d7d

Browse files
committed
ref(controller): remove redis cache library and settings
CACHE_URL and the python Redis library were not actually being used by the controller.
1 parent 583f9f3 commit ec62d7d

5 files changed

Lines changed: 1 addition & 10 deletions

File tree

controller/conf.d/confd_settings.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ gid = 1000
66
mode = "0640"
77
keys = [
88
"/deis/controller",
9-
"/deis/cache",
109
"/deis/database",
1110
"/deis/registry",
1211
"/deis/domains",

controller/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ paramiko==1.14.1
1616
psycopg2==2.5.4
1717
python-etcd==0.3.2
1818
PyYAML==3.11
19-
redis==2.9.1
2019
static==1.0.2
2120
South==1.0.1

controller/templates/confd_settings.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
}
3535
}
3636

37-
# configure cache
38-
CACHE_URL = 'redis://{{ .deis_cache_host }}:{{ .deis_cache_port }}/0'
39-
4037
# move log directory out of /app/deis
4138
DEIS_LOG_DIR = '/data/logs'
4239

controller/tests/controller_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@ func TestController(t *testing.T) {
1717
"/deis/registry/protocol",
1818
"/deis/registry/host",
1919
"/deis/registry/port",
20-
"/deis/cache/host",
21-
"/deis/cache/port",
2220
"/deis/platform/domain",
2321
}
2422
setdir := []string{
2523
"/deis/controller",
26-
"/deis/cache",
2724
"/deis/database",
2825
"/deis/registry",
2926
"/deis/domains",

docs/understanding_deis/components.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ platform state. Backups and WAL logs are pushed to :ref:`Store`.
2727

2828
Cache
2929
-----
30-
The cache is an instance of `Redis`_ used by the controller
31-
and registry.
30+
The cache is an instance of `Redis`_ used by the registry.
3231

3332
.. _builder:
3433

0 commit comments

Comments
 (0)