Merge "Making supervisor ini files of contrail-api and contrail-disco…

…very in sync"

src/config/api-server/contrail-api.ini

@@ -1,11 +1,13 @@
 [program:contrail-api]
-command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --listen_port 91%(process_num)02d --worker_id 0
+command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --listen_port 91%(process_num)02d --worker_id %(process_num)s
+numprocs=1
+process_name=%(process_num)s
+redirect_stderr=true
+stdout_logfile= /var/log/contrail/contrail-api-%(process_num)s-stdout.log
+stderr_logfile=/dev/null
 priority=440
 autostart=true
 killasgroup=true
 stopsignal=KILL
-redirect_stderr=true
-stdout_logfile=/var/log/contrail/contrail-api-stdout.log
-stderr_logfile=/dev/null
-exitcodes=0                   ; 'expected' exit codes for process (default 0,2)
+exitcodes=0 ; 'expected' exit codes for process (default 0,2)
 user=contrail

src/config/schema-transformer/contrail-schema.ini

@@ -1,5 +1,5 @@
 [program:contrail-schema]
-command=/usr/bin/contrail-schema --conf_file /etc/contrail/contrail-schema.conf
+command=/usr/bin/contrail-schema --conf_file /etc/contrail/contrail-schema.conf --conf_file /etc/contrail/contrail-keystone-auth.conf
 priority=450
 autostart=true
 autorestart=true

src/config/svc-monitor/contrail-svc-monitor.ini

@@ -1,5 +1,5 @@
 [program:contrail-svc-monitor]
-command=/usr/bin/contrail-svc-monitor --conf_file /etc/contrail/contrail-svc-monitor.conf
+command=/usr/bin/contrail-svc-monitor --conf_file /etc/contrail/contrail-svc-monitor.conf --conf_file /etc/contrail/contrail-keystone-auth.conf
 priority=460
 autostart=true
 killasgroup=true

src/discovery/contrail-discovery.ini

@@ -1,11 +1,13 @@
 [program:contrail-discovery]
-command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf
+command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --listen_port 911%(process_num)01d --worker_id %(process_num)s
+numprocs=1
+process_name=%(process_num)s
+redirect_stderr=true
+stdout_logfile= /var/log/contrail/contrail-discovery-%(process_num)s-stdout.log
+stderr_logfile=/dev/null
 priority=430
 autostart=true
 killasgroup=true
 stopsignal=KILL
-redirect_stderr=true
-stdout_logfile=/var/log/contrail/contrail-discovery-stdout.log
-stderr_logfile=/dev/null
-exitcodes=0                   ; 'expected' exit codes for process (default 0,2)
+exitcodes=0 ;'expected' exit codes for process (default 0,2)
 user=contrail