summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-03-02 16:07:45 -0600
committerAndy Doan <andy.doan@linaro.org>2016-03-02 16:08:40 -0600
commitbc140964e9f808a46034bafab084ac2195712bda (patch)
treef7ec9dbcbd80f13bf4b4af07c6bda676ac2a1e90
parent62962e4533abb67dd4851fe1a0b9c4efdfc35cd8 (diff)
publishing: update to django 1.8.10
longerusername isn't needed in recent django (it comes with a long user name) Change-Id: I48b3fdec7c8d8a844a42b98014a7cbcba8e29d87
-rw-r--r--group_vars/publishing7
-rw-r--r--roles/publishing-deps/tasks/main.yml7
2 files changed, 4 insertions, 10 deletions
diff --git a/group_vars/publishing b/group_vars/publishing
index 4c936d22..5495d150 100644
--- a/group_vars/publishing
+++ b/group_vars/publishing
@@ -1,8 +1,7 @@
-django_south: True
-use_pip: False
+django_use_pypi: True
apache_user: www-data
-git_repo: http://git.linaro.org/git/infrastructure/linaro-license-protection.git
-git_tag: HEAD
+django_project_repo: http://git.linaro.org/git/infrastructure/linaro-license-protection.git
+django_project_version: HEAD
django_settings: settings_production
hostname: "{{inventory_hostname}}"
diff --git a/roles/publishing-deps/tasks/main.yml b/roles/publishing-deps/tasks/main.yml
index 77044e9f..e5ad9896 100644
--- a/roles/publishing-deps/tasks/main.yml
+++ b/roles/publishing-deps/tasks/main.yml
@@ -15,11 +15,6 @@
tags:
- update
-# This package is in Ubuntu starting with Vivid, so we should be able to use
-# apt when we move to 16.04.
-- name: Install PIP longerusername
- pip: name=longerusername
-
- name: Create base directory for installation
file: path={{ install_base }}/{{ inventory_hostname }}
owner={{ apache_user }}
@@ -53,4 +48,4 @@
- name: Install publishing crontab file
template: src=llp-crontab.cron dest=/etc/cron.d/llp-crontab
- owner=root group=root mode=0644 \ No newline at end of file
+ owner=root group=root mode=0644