Merge pull request #3931 from edx/feanil/update_cookiecutter

Make cookiecutter allow extra debian pkgs and update default dockerfile.

playbooks/roles/ansible-role-django-ida/templates/defaults/main.yml.j2

@@ -98,6 +98,8 @@
 
 {{ role_name|upper }}_HOSTNAME: '~^((stage|prod)-)?{{ role_name|replace('_', '-') }}.*'
 
+{{ role_name|upper }}_DEBIAN_EXTRA_PKGS: []
+
 nginx_{{ role_name }}_gunicorn_hosts:
   - 127.0.0.1
 

playbooks/roles/ansible-role-django-ida/templates/docker/build/ROLE_NAME/Dockerfile.j2

@@ -7,7 +7,7 @@
 # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
 # with the currently checked-out configuration repo.
 
-FROM edxops/trusty-common:latest
+FROM edxops/xenial-common:latest
 MAINTAINER edxops
 
 ARG {{ role_name|upper }}_VERSION=master

playbooks/roles/ansible-role-django-ida/templates/meta/main.yml.j2

@@ -21,5 +21,5 @@ dependencies:
     edx_service_user: "{{ '{{' }} {{ role_name }}_user }}"
     edx_service_home: "{{ '{{' }} {{ role_name }}_home }}"
     edx_service_packages:
-      debian: "{{ '{{' }} {{ role_name }}_debian_pkgs }}"
+      debian: "{{ '{{' }} {{ role_name }}_debian_pkgs + {{ role_name|upper }}_DEBIAN_EXTRA_PKGS }}"
       redhat: "{{ '{{' }} {{ role_name }}_redhat_pkgs }}"