This commit brings in provisioning changes that will be needed to

support redis authentication. The template conf files are changed
to set the password if we are providing one in testbed.py
The provisioning changes take care of only the changes needed for
analytics daemon and starting redis. Webui changes are tracked
separately
Partial-Bug: 1392113

Change-Id: Ie3d1027509dccc198d5e61c4a092dd59c275a395

contrail_provisioning/collector/setup.py

@@ -43,6 +43,7 @@ def parse_args(self, args_str):
         parser.add_argument("--analytics_data_ttl", help = "TTL in hours of data stored in cassandra database", type = int)
         parser.add_argument("--analytics_syslog_port", help = "Listen port for analytics syslog server", type = int)
         parser.add_argument("--internal_vip", help = "Internal VIP Address of openstack nodes")
+        parser.add_argument("--redis_password", help = "Redis password")
         self._args = parser.parse_args(self.remaining_argv)
 
     def fixup_config_files(self):
@@ -63,7 +64,11 @@ def fixup_contrail_collector(self):
                          '__contrail_http_server_port__' : '8089',
                          '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list),
                          '__contrail_analytics_data_ttl__' : self._args.analytics_data_ttl,
-                         '__contrail_analytics_syslog_port__' : str(self._args.analytics_syslog_port)}
+                         '__contrail_analytics_syslog_port__' : str(self._args.analytics_syslog_port),
+                         '__contrail_redis_password__' : ''
+                       }
+        if self._args.redis_password:
+            template_vals['__contrail_redis_password__'] = 'password = '+ self._args.redis_password
         self._template_substitute_write(contrail_collector_conf.template,
                                    template_vals, self._temp_dir_name + '/contrail-collector.conf')
         local("sudo mv %s/contrail-collector.conf /etc/contrail/contrail-collector.conf" %(self._temp_dir_name))
@@ -75,7 +80,10 @@ def fixup_contrail_query_engine(self):
                          '__contrail_http_server_port__' : '8091',
                          '__contrail_collector__' : '127.0.0.1',
                          '__contrail_collector_port__' : '8086',
-                         '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list)}
+                         '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list),
+                         '__contrail_redis_password__' : ''}
+        if self._args.redis_password:
+            template_vals['__contrail_redis_password__'] = 'password = '+ self._args.redis_password
         self._template_substitute_write(contrail_query_engine_conf.template,
                                         template_vals, self._temp_dir_name + '/contrail-query-engine.conf')
         local("sudo mv %s/contrail-query-engine.conf /etc/contrail/contrail-query-engine.conf" %(self._temp_dir_name))
@@ -97,7 +105,10 @@ def fixup_contrail_analytics_api(self):
                          '__contrail_discovery_port__' : 5998,
                          '__contrail_collector__': self._args.self_collector_ip,
                          '__contrail_collector_port__': '8086',
-                         '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list)}
+                         '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list),
+                         '__contrail_redis_password__' : ''}
+        if self._args.redis_password:
+            template_vals['__contrail_redis_password__'] = 'redis_password = '+ self._args.redis_password
         self._template_substitute_write(contrail_analytics_api_conf.template,
                                         template_vals, self._temp_dir_name + '/contrail-analytics-api.conf')
         local("sudo mv %s/contrail-analytics-api.conf /etc/contrail/contrail-analytics-api.conf" %(self._temp_dir_name))

contrail_provisioning/collector/templates/contrail_analytics_api_conf.py

@@ -20,5 +20,5 @@
 [REDIS]
 redis_server_port = $__contrail_redis_server_port__
 redis_query_port = $__contrail_redis_query_port__
-
+$__contrail_redis_password__
 """)

contrail_provisioning/collector/templates/contrail_collector_conf.py

@@ -77,5 +77,6 @@
 
 # IP address of redis-server
 server=127.0.0.1
+$__contrail_redis_password__
 
 """)

contrail_provisioning/collector/templates/contrail_query_engine_conf.py

@@ -29,5 +29,6 @@
 [REDIS]
   port=$__contrail_redis_server_port__
   server=$__contrail_redis_server__
+  $__contrail_redis_password__
 
 """)