Merge pull request #90 from edx/jbau-distribute

sets --distribute flag in virtualenv creation

playbooks/roles/common/tasks/create_venv.yml

 ---
 # create the 'edx' virtual environment in /opt so that roles can populate it
-- name: easy_install pip
-  easy_install: name=pip
+- name: Install python and pip
+  apt: pkg={{item}} install_recommends=yes state=present update_cache=yes
+  with_items:
+  - python2.7
+  - python-pip
   tags:
-  - venv_base
+  - pre_install
   - install
 
 - name: pip install virtualenv
@@ -25,7 +28,7 @@
   - install
 
 - name: create the edx virtualenv directory initial contents
-  command: /usr/local/bin/virtualenv $venv_dir creates=$venv_dir/bin/activate
+  command: /usr/local/bin/virtualenv $venv_dir --distribute creates=$venv_dir/bin/activate
   tags:
   - venv_base
   - install

playbooks/roles/nginx/tasks/main.yml

@@ -61,3 +61,10 @@
   - nginx
   - update
   
+- name: Register the fact that nginx has run
+  command: echo True
+  register: nginx_role_run
+  tags:
+  - nginx
+  - update
+

playbooks/roles/nginx/tasks/nginx_site.yml

@@ -7,6 +7,7 @@
   # seems like paths in first_available_file must be relative to the playbooks dir
   - "roles/nginx/templates/{{ site_name }}.j2" 
   notify: restart nginx
+  when_set: $nginx_role_run
   tags:
   - nginx
   - lms
@@ -17,6 +18,7 @@
 - name: Creating nginx config link {{ site_name }}
   file: src=/etc/nginx/sites-available/{{ site_name }} dest=/etc/nginx/sites-enabled/{{ site_name }} state={{ state }} owner=root group=root
   notify: restart nginx
+  when_set: $nginx_role_run
   tags:
   - nginx
   - lms