Revert "Add redis password parameter"
This reverts commit aa4f274bc58a07e7634681541f45445747f51f41.
Change-Id: I968650724c8cf1d37e87c2ff7f139b6160ec3005
diff --git a/README.rst b/README.rst
index 3507284..e285e13 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,6 @@
cache:
engine: redis
host: 127.0.0.1
- password: guest
port: 6379
members:
- host: 127.0.0.1
@@ -333,7 +332,6 @@
cache:
engine: redis
host: 127.0.0.1
- password: guest
port: 6379
members:
- host: 127.0.0.1
@@ -475,7 +473,6 @@
cache:
engine: redis
host: 127.0.0.1
- password: guest
port: 6379
members:
- host: 127.0.0.1
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index f3e60e2..dedcc1f 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -9,7 +9,6 @@
opencontrail_identity_version: '2.0'
keystone_admin_password: 'none'
keystone_service_token: 'none'
- redis_password: 'none'
openstack_region: RegionOne
opencontrail:
common:
@@ -161,7 +160,6 @@
engine: redis
host: ${_param:cluster_local_address}
port: 6379
- password: ${_param:redis_password}
members:
- host: ${_param:cluster_node01_address}
id: 1
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index ca7d426..c3bb5d1 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -10,7 +10,6 @@
keystone_admin_password: 'none'
keystone_service_token: 'none'
openstack_region: RegionOne
- redis_password: 'none'
opencontrail:
common:
version: ${_param:opencontrail_version}
@@ -117,7 +116,6 @@
web:
version: ${_param:opencontrail_version}
enabled: True
- password: ${_param:redis_password}
bind:
address: ${_param:cluster_local_address}
analytics:
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 42181a4..f17d610 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -10,7 +10,6 @@
keystone_admin_password: 'none'
keystone_service_token: 'none'
openstack_region: RegionOne
- redis_password: 'none'
opencontrail:
common:
version: ${_param:opencontrail_version}
@@ -142,7 +141,6 @@
engine: redis
host: ${_param:single_address}
port: 6379
- password: ${_param:redis_password}
members:
- host: ${_param:single_address}
id: 1
diff --git a/opencontrail/files/4.0/config.global.js b/opencontrail/files/4.0/config.global.js
index a92a22d..e420435 100644
--- a/opencontrail/files/4.0/config.global.js
+++ b/opencontrail/files/4.0/config.global.js
@@ -261,7 +261,7 @@
{%- else %}
config.redis_dump_file = '/var/lib/redis/dump-webui.rdb';
{%- endif %}
-config.redis_password = '{{ web.cache.get('password', 'guest') }}';
+config.redis_password = '';
/* Cassandra Server */
config.cassandra = {};
diff --git a/opencontrail/files/4.0/contrail-alarm-gen.conf b/opencontrail/files/4.0/contrail-alarm-gen.conf
index 035367f..e0c51a3 100644
--- a/opencontrail/files/4.0/contrail-alarm-gen.conf
+++ b/opencontrail/files/4.0/contrail-alarm-gen.conf
@@ -1,5 +1,4 @@
{%- from "opencontrail/map.jinja" import collector with context %}
-{%- from "opencontrail/map.jinja" import web with context %}
[DEFAULTS]
host_ip = {{ collector.bind.address }}
collectors = {% for member in collector.analytics.members %}{{ member.host }}:8086 {% endfor %}
@@ -31,7 +30,6 @@
[REDIS]
redis_server_port=6379
redis_uve_list = {% for member in collector.database.members %}{{ member.host }}:6379 {% endfor %}
-redis_password = {{ web.get('cache', {}).get('password', 'guest') }}
[SANDESH]
#sandesh_ssl_enable=False
diff --git a/opencontrail/files/4.0/contrail-analytics-api.conf b/opencontrail/files/4.0/contrail-analytics-api.conf
index 629862e..98544ae 100644
--- a/opencontrail/files/4.0/contrail-analytics-api.conf
+++ b/opencontrail/files/4.0/contrail-analytics-api.conf
@@ -1,5 +1,4 @@
{%- from "opencontrail/map.jinja" import collector with context %}
-{%- from "opencontrail/map.jinja" import web with context %}
[DEFAULTS]
host_ip = {{ collector.bind.address }}
collectors = {% for member in collector.database.members %}{{ member.host }}:8086 {% endfor %}
@@ -34,7 +33,6 @@
[REDIS]
redis_query_port = 6379
redis_uve_list = {% for member in collector.database.members %}{{ member.host }}:6379 {% endfor %}
-redis_password = {{ web.get('cache', {}).get('password', 'guest') }}
[SANDESH]
#sandesh_ssl_enable=False
diff --git a/opencontrail/files/4.0/contrail-collector.conf b/opencontrail/files/4.0/contrail-collector.conf
index 6613826..35f89cf 100644
--- a/opencontrail/files/4.0/contrail-collector.conf
+++ b/opencontrail/files/4.0/contrail-collector.conf
@@ -1,5 +1,4 @@
{%- from "opencontrail/map.jinja" import collector with context %}
-{%- from "opencontrail/map.jinja" import web with context %}
#
# Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.
#
@@ -116,4 +115,3 @@
[REDIS]
port=6379
server=127.0.0.1
-password={{ web.get('cache', {}).get('password', 'guest') }}
diff --git a/opencontrail/files/4.0/contrail-query-engine.conf b/opencontrail/files/4.0/contrail-query-engine.conf
index 7ffd52c..3cc9ef6 100644
--- a/opencontrail/files/4.0/contrail-query-engine.conf
+++ b/opencontrail/files/4.0/contrail-query-engine.conf
@@ -1,5 +1,4 @@
{%- from "opencontrail/map.jinja" import collector with context %}
-{%- from "opencontrail/map.jinja" import web with context %}
#
# Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.
#
@@ -32,7 +31,6 @@
[REDIS]
port=6379
server=127.0.0.1
-password = {{ web.get('cache', {}).get('password', 'guest') }}
[SANDESH]
# sandesh_ssl_enable=false
diff --git a/opencontrail/files/4.0/redis.conf b/opencontrail/files/4.0/redis.conf
index 5c1f1c9..db9c433 100644
--- a/opencontrail/files/4.0/redis.conf
+++ b/opencontrail/files/4.0/redis.conf
@@ -1,5 +1,4 @@
{%- from "opencontrail/map.jinja" import collector with context %}
-{%- from "opencontrail/map.jinja" import web with context %}
# Redis configuration file example
# Note on units: when memory size is needed, it is possible to specify
@@ -194,9 +193,6 @@
# refuse the slave request.
#
# masterauth <master-password>
-{%- if web.get('cache', {}).get("password", None) %}
-masterauth {{ web.cache.password }}
-{%- endif %}
# When a slave loses its connection with the master, or when the replication
# is still in progress, the slave can act in two different ways:
@@ -333,9 +329,6 @@
# use a very strong password otherwise it will be very easy to break.
#
# requirepass foobared
-{%- if web.get('cache', {}).get("password", None) %}
-requirepass {{ web.cache.password }}
-{%- endif %}
# Command renaming.
#