Replaced VirtualBox image reference with trusty (Ubuntu 14.04), added…

… task to upgrade pip, used recommended syntax for environment variable.

README.md

@@ -14,7 +14,7 @@ Ansible Playbook designed for environments running a Django app.  It can install
 
 Default settings are stored in ```roles/role_name/vars/main.yml```.  Environment-specific settings are in the ```env_vars``` directory.
 
-**Tested with OS:** Ubuntu 12.04 LTS x64, Ubuntu 14.04 LTS x64
+**Tested with OS:** Ubuntu 14.04 LTS x64
 
 **Tested with Cloud Providers:** [Digital Ocean](https://www.digitalocean.com/?refcode=5aa134a379d7), [Amazon](https://aws.amazon.com), [Rackspace](http://www.rackspace.com/)
 

Vagrantfile

@@ -5,8 +5,8 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.box = "trusty64"
+  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
 
   config.vm.network :private_network, ip: "192.168.33.15"
 
@@ -22,6 +22,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "ansible" do |ansible|
     ansible.playbook = "vagrant.yml"
     ansible.host_key_checking = false
-    ansible.verbose = "v"
+    ansible.verbose = "vv"
   end
 end

roles/base/tasks/main.yml

@@ -27,6 +27,6 @@
     - supervisor
   tags: packages
 
-- name: Install virtualenv
-  pip: name=virtualenv
+- name: Upgrade pip
+  pip: name=pip state=latest
   tags: packages

roles/rabbitmq/tasks/main.yml

@@ -1,7 +1,5 @@
 ---
 
-- include: install_erlang.yml
-
 - name: Add the RabbitMQ public GPG key to the apt repo
   apt_key: url=http://www.rabbitmq.com/rabbitmq-signing-key-public.asc
            state=present

roles/web/tasks/setup_django_app.yml

@@ -3,13 +3,16 @@
 - name: Install packages required by the Django app inside virtualenv
   pip: virtualenv={{ virtualenv_path }} requirements={{ requirements_file }}
 
+- name: Ensure the manage.py file is executable
+  acl: name="{{ project_path }}/manage.py" etype=user permissions="rwx" state=present
+
 - name: Run the Django syncdb command
   django_manage:
     command: syncdb
     app_path: "{{ project_path }}"
     virtualenv: "{{ virtualenv_path }}"
     settings: "{{ django_settings_file }}"
-  environment: django_environment
+  environment: "{{ django_environment }}"
   when: run_django_syncdb is defined and run_django_syncdb
   tags: django.syncdb
 
@@ -19,7 +22,7 @@
     app_path: "{{ project_path }}"
     virtualenv: "{{ virtualenv_path }}"
     settings: "{{ django_settings_file }}"
-  environment: django_environment
+  environment: "{{ django_environment }}"
   when: run_django_db_migrations is defined and run_django_db_migrations
   tags: django.migrate
 
@@ -29,6 +32,6 @@
     app_path: "{{ project_path }}"
     virtualenv: "{{ virtualenv_path }}"
     settings: "{{ django_settings_file }}"
-  environment: django_environment
+  environment: "{{ django_environment }}"
   when: run_django_collectstatic is defined and run_django_collectstatic
   tags: django.collectstatic

roles/web/tasks/setup_virtualenv.yml

@@ -1,5 +1,9 @@
 ---
 
+- name: Install virtualenv
+  pip: name=virtualenv
+  tags: packages
+
 - name: Create the virtualenv
   command: virtualenv {{ virtualenv_path }} --no-site-packages
            creates={{ virtualenv_path }}/bin/activate