First pass dashes to underscores

playbooks/roles/edx-notes-api/defaults/main.yml → playbooks/roles/edx_notes_api/defaults/main.yml

@@ -79,18 +79,10 @@ edx_notes_api_service_config:
 #
 # vars are namespace with the module name.
 #
-edx_notes_api_code_dir: "{{ edx_notes_api_app_dir }}/edx-notes-api"
-edx_notes_api_role_name: edx-notes-api
-edx_notes_api_service_name: "{{ edx_notes_api_role_name }}"
-# underscore name
-edx_notes_api_role_name_safe: "{{ edx_notes_api_role_name.replace('-', '_') }}"
-
-edx_notes_api_source_repo: https://{{ COMMON_GIT_MIRROR }}/edx/edx-notes-api.git
-
-edx_notes_api_user: "{{ edx_notes_api_role_name }}"
+edx_notes_api_service_name: edx_notes_api
 edx_notes_api_app_dir: "{{ COMMON_APP_DIR }}/{{ edx_notes_api_service_name }}"
 edx_notes_api_home: "{{ COMMON_APP_DIR }}/{{ edx_notes_api_service_name }}"
-edx_notes_api_python_path: "{{ edx_notes_api_code_dir }}/edx-notes-api"
+edx_notes_api_python_path: "{{ edx_notes_api_code_dir }}/{{ edx_notes_api_service_name }}"
 edx_notes_api_conf_dir: "{{ edx_notes_api_home }}"
 
 edx_notes_api_gunicorn_host: "127.0.0.1"

playbooks/roles/edx-notes-api/meta/main.yml → playbooks/roles/edx_notes_api/meta/main.yml

@@ -21,7 +21,6 @@
 
 dependencies:
   - role: edx_service
-    edx_role_name: "{{ edx_notes_api_role_name }}"
     edx_service_name: "{{ edx_notes_api_service_name }}"
     edx_service_config: "{{ edx_notes_api_service_config }}"
     edx_service_repos: "{{ edx_notes_api_repos }}"

playbooks/roles/edx-notes-api/tasks/main.yml → playbooks/roles/edx_notes_api/tasks/main.yml

@@ -118,5 +118,5 @@
 - name: create manage.py symlink
   file: >
     src="{{ edx_notes_api_manage }}"
-    dest="{{ COMMON_BIN_DIR }}/manage.{{ edx_notes_api_role_name }}"
+    dest="{{ COMMON_BIN_DIR }}/manage.{{ edx_notes_api_service_name }}"
     state=link