Permalink
Browse files

Add some dependencies.

  • Loading branch information...
Michael Nelson
Michael Nelson committed Jun 20, 2014
1 parent 8c28187 commit df70e589698607913294ef268a2170d82291f870
Showing with 21 additions and 0 deletions.
  1. +2 −0 Makefile
  2. +8 −0 django-project/clickreviewsproject/wsgi.py
  3. +11 −0 playbook.yml
View
@@ -53,6 +53,8 @@ $(REVIEWS_CODE):
@echo Grabbing the reviews server code
@mkdir -p ../.sourcecode
@cd ../.sourcecode && bzr branch -r $(REVIEWS_REVNO) lp:rnr-server
+ @echo "Pulling required branhc dependencies (this requires python-fabric)"
+ @cd ../.sourcecode/rnr-server && fab pull_required_branches
create-tarball: $(REVIEWS_CODE) files/r$(REVIEWS_REVNO)/rnr-server.tgz
@@ -1,6 +1,14 @@
import os
+import sys
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "clickreviewsproject.settings")
+extra_paths = [
+ '/srv/click-reviews.ubuntu.com/code/current/branches/scaclient/',
+ '/srv/click-reviews.ubuntu.com/code/current/branches/piston-mini-client/',
+ '/srv/click-reviews.ubuntu.com/code/current/branches/django-piston/',
+]
+sys.path.extend(extra_paths)
+
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
View
@@ -23,6 +23,8 @@
apt: pkg={{ item }}
with_items:
- python-django=1.5.4-1ubuntu1~ctools0
+ - python-tz
+ - python-pip
tags:
- install
- upgrade-charm
@@ -34,3 +36,12 @@
- upgrade-charm
notify:
- Restart wsgi
+
+ # XXX Normally our deployment build would ensure these are all available in the tarball.
+ - name: Install any non-distro dependencies (Don't depend on pip for a real deployment!)
+ pip: name={{ item.key }} version={{ item.value }}
+ with_dict:
+ south: 0.7.6
+ tags:
+ - install
+ - upgrade-charm

0 comments on commit df70e58

Please sign in to comment.