From 1bcbe0bac328e26341ba68341d4b809c32b8242f Mon Sep 17 00:00:00 2001 From: mbeierl Date: Wed, 29 Mar 2017 21:00:50 -0400 Subject: Use tagged version of graphite Changes the docker build procedure to use a pip install of a specific version of graphite so that it doesn't break when upstream changes occur. Change-Id: I2316912fc04568c441212087665e384075e409a6 JIRA: STORPERF-110 Signed-off-by: mbeierl --- docker/supervisord.conf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'docker/supervisord.conf') diff --git a/docker/supervisord.conf b/docker/supervisord.conf index 0a78928..834e23c 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -1,19 +1,25 @@ [supervisord] nodaemon = true -environment = GRAPHITE_STORAGE_DIR='/opt/graphite/storage',GRAPHITE_CONF_DIR='/opt/graphite/conf' +environment = GRAPHITE_STORAGE_DIR='/var/lib/graphite/storage',GRAPHITE_CONF_DIR='/var/lib/graphite/conf' + +[program:nginx] +command = /usr/sbin/nginx +stdout_logfile = /var/log/supervisor/%(program_name)s.log +stderr_logfile = /var/log/supervisor/%(program_name)s.log +autorestart = true [program:carbon-cache] user = www-data -command = /opt/graphite/bin/carbon-cache.py --debug start +command = /var/lib/graphite/bin/carbon-cache.py --debug start stdout_logfile = /var/log/supervisor/%(program_name)s.log stderr_logfile = /var/log/supervisor/%(program_name)s.log autorestart = true [program:graphite-webapp] user = www-data -directory = /opt/graphite/webapp -environment = PYTHONPATH='/opt/graphite/webapp' -command = /opt/graphite/bin/gunicorn_django -b0.0.0.0:8000 -w2 graphite/settings.py +directory = /var/lib/graphite/webapp +environment = PYTHONPATH='/var/lib/graphite/webapp' +command = /usr/bin/gunicorn_django -b127.0.0.1:8080 -w2 graphite/settings.py stdout_logfile = /var/log/supervisor/%(program_name)s.log stderr_logfile = /var/log/supervisor/%(program_name)s.log autorestart = true @@ -32,4 +38,3 @@ command = /usr/bin/python /home/opnfv/repos/storperf/rest_server.py stdout_logfile = /var/log/supervisor/%(program_name)s.log stderr_logfile = /var/log/supervisor/%(program_name)s.log autorestart = true - -- cgit 1.2.3-korg