From 39da4db13f94ab523d9f2b24b95522b473ebd6a6 Mon Sep 17 00:00:00 2001
From: tresbailey <tres.bailey@gmail.com>
Date: Sat, 10 Aug 2013 22:35:55 -0400
Subject: [PATCH] Adding to python path the client override config

---
 bin/control                | 2 +-
 conf.d/celeryconfig.py.erb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/control b/bin/control
index 0a797cd..ac5fe7d 100755
--- a/bin/control
+++ b/bin/control
@@ -5,7 +5,7 @@ PATH=/bin/:/usr/bin:$PATH
 #source $OPENSHIFT_CARTRIDGE_SDK_BASH
 
 function start {
-    export PYTHONPATH=$OPENSHIFT_PYTHON_DIR:$OPENSHIFT_CELERY_DIR/conf.d:$OPENSHIFT_REPO_DIR:$PYTHONPATH
+    export PYTHONPATH=$OPENSHIFT_REPO_DIR/.openshift:$OPENSHIFT_CELERY_DIR/conf.d:$OPENSHIFT_REPO_DIR:$PYTHONPATH
     usr/celeryd --pidfile=etc/celeryd.pid
 }
 
diff --git a/conf.d/celeryconfig.py.erb b/conf.d/celeryconfig.py.erb
index 0259f32..369fa89 100644
--- a/conf.d/celeryconfig.py.erb
+++ b/conf.d/celeryconfig.py.erb
@@ -1,3 +1,4 @@
+print 'Configuring celeryd with default cartridge config file'
 <%
 broker_type = ENV.fetch('OPENSHIFT_CELERY_BROKER_TRANS', 'mongodb')
 if broker_type == "mongodb" %>