It works!

playbooks/roles/edx_notes_api/defaults/main.yml

@@ -26,11 +26,7 @@ EDX_NOTES_API_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }
 EDX_NOTES_API_SECRET_KEY: "i^,9%i=e=y/Nlpb=Mkx!j&,HD9d/17F][9P,FLdwM2+G6|]BEU"
 EDX_NOTES_API_CLIENT_ID: edx_notes_id
 EDX_NOTES_API_CLIENT_SECRET: edx_notes_secret
-EDX_NOTES_API_CLIENT_ID: edx-notes-id
-EDX_NOTES_API_CLIENT_SECRET: edx-notes-secret
-EDX_NOTES_API_CLIENT_ID: edx_notes_id
-EDX_NOTES_API_CLIENT_SECRET: edx_notes_secret
-EDX_NOTES_API_GIT_SSH_KEY: !null
+EDX_NOTES_API_GIT_SSH_KEY: !!null
 
 EDX_NOTES_API_DATABASES:
   # rw user
@@ -45,12 +41,11 @@ EDX_NOTES_API_ALLOWED_HOSTS:
   - localhost
 
 EDX_NOTES_API_REPOS:
-  # - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
-  - PROTOCOL: ssh
+  - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
     DOMAIN: "{{ COMMON_GIT_MIRROR }}"
     PATH: "{{ COMMON_GIT_PATH }}"
     REPO: edx-notes-api.git
-    VERSION: max/dashes2underscores
+    VERSION: master
     DESTINATION: "{{ edx_notes_api_code_dir }}"
     SSH_KEY: "{{ EDX_NOTES_API_GIT_SSH_KEY }}"
 

playbooks/roles/edx_notes_api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2

 [program:{{ edx_notes_api_service_name }}]
 
-{% if COMMON_ENABLE_NEWRELIC_APP %}
-<<<<<<< Updated upstream:playbooks/roles/edx_notes_api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
-{% set edx_notes_api_venv_bin = edx_notes_api_home/venvs/edx_notes_api_service_name/bin %}
-=======
-<<<<<<< Updated upstream:playbooks/roles/edx-notes-api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
-=======
 {% set edx_notes_api_venv_bin = edx_notes_api_home + '/venvs/' + edx_notes_api_service_name + '/bin' %}
->>>>>>> Stashed changes:playbooks/roles/edx_notes_api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
->>>>>>> Stashed changes:playbooks/roles/edx-notes-api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
+{% if COMMON_ENABLE_NEWRELIC_APP %}
 {% set executable = edx_notes_api_venv_bin + '/newrelic-admin run-program ' + edx_notes_api_venv_bin + '/gunicorn' %}
 {% else %}
 {% set executable = edx_notes_api_venv_bin + '/gunicorn' %}
 {% endif %}
 
-<<<<<<< Updated upstream:playbooks/roles/edx_notes_api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
-command={{ executable }} -c {{ edx_notes_api_home }}/edx-notes-api-gunicorn.py {{ EDX_NOTES_API_GUNICORN_WORKERS_EXTRA }} {{ edx_notes_api_wsgi }}
-=======
-<<<<<<< Updated upstream:playbooks/roles/edx-notes-api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
-command={{ executable }} -c {{ edx_notes_api_app_dir }}/edx-notes-api-gunicorn.py {{ EDX_NOTES_API_GUNICORN_WORKERS_EXTRA }} {{ edx_notes_api_wsgi }}
-=======
 command={{ executable }} -c {{ edx_notes_api_home }}/edx_notes_api_gunicorn.py {{ EDX_NOTES_API_GUNICORN_WORKERS_EXTRA }} {{ edx_notes_api_wsgi }}
->>>>>>> Stashed changes:playbooks/roles/edx_notes_api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
->>>>>>> Stashed changes:playbooks/roles/edx-notes-api/templates/edx/app/supervisor/conf.d.available/edx_notes_api.conf.j2
 
 user={{ common_web_user }}
 directory={{ edx_notes_api_code_dir }}

playbooks/roles/edx_service/tasks/main.yml

@@ -71,6 +71,7 @@
 
 # Replace dashes with underscores to support roles that use
 # dashes (the role vars will contain underscores)
+#TODO: REMOVE UNDERSCORE-TO-DASH CONVERSION ONCE ALL ROLES ARE NORMALIZED
 - name: install a bunch of system packages on which edx_service relies
   apt: pkg={{ item }} state=present
   with_items: "{{ edx_service_name.replace('-', '_') }}_debian_pkgs"
@@ -108,7 +109,7 @@
 - name: checkout code over https
   git: >
     repo=https://{{ item.DOMAIN }}/{{ item.PATH }}/{{ item.REPO }}
-    dest={{ item.DESTINATION }}  version={{ item.VERSION }}
+    dest={{ item.DESTINATION }}  version={{ item.VERSION }} depth=1
   sudo_user: "{{ edx_service_user }}"
   register: code_checkout
   when: item.PROTOCOL == "https"