From 075fc2671d6f5bca104d809504f6fc57bfcca102 Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Date: Mon, 17 Nov 2014 22:11:30 -0800 Subject: [PATCH] Making supervisor ini files of contrail-api and contrail-discovery in sync supervisor ini files for contrail-api and contrail-discovery in the contrail-controller repo are outdated, Making it in sync with the way we edit/populate the ini files during provisioning. Change-Id: Id4e0bb4046a91370fcf4f4ad0ea1f76a3a1706ee Closes-Bug: 1380890 --- src/config/api-server/contrail-api.ini | 12 +++++++----- src/config/schema-transformer/contrail-schema.ini | 2 +- src/config/svc-monitor/contrail-svc-monitor.ini | 2 +- src/discovery/contrail-discovery.ini | 12 +++++++----- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/config/api-server/contrail-api.ini b/src/config/api-server/contrail-api.ini index cef9733c25d..f9d1907aac1 100644 --- a/src/config/api-server/contrail-api.ini +++ b/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 diff --git a/src/config/schema-transformer/contrail-schema.ini b/src/config/schema-transformer/contrail-schema.ini index db1ee158210..0f1e2b198db 100644 --- a/src/config/schema-transformer/contrail-schema.ini +++ b/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 diff --git a/src/config/svc-monitor/contrail-svc-monitor.ini b/src/config/svc-monitor/contrail-svc-monitor.ini index 28fb974af21..1bc2f033ad0 100644 --- a/src/config/svc-monitor/contrail-svc-monitor.ini +++ b/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 diff --git a/src/discovery/contrail-discovery.ini b/src/discovery/contrail-discovery.ini index 4b742404edc..30054b92bf3 100644 --- a/src/discovery/contrail-discovery.ini +++ b/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