Potentially risky dashes to underscores

playbooks/roles/edx_notes_api/defaults/main.yml

@@ -15,18 +15,23 @@ EDX_NOTES_API_GUNICORN_WORKERS_EXTRA: ""
 EDX_NOTES_API_WORKERS_EXTRA_CONF: ""
 EDX_NOTES_API_LANG: en-us
 EDX_NOTES_API_WORKERS: !!null
-EDX_NOTES_API_DATASTORE_NAME: edx-notes-api
+EDX_NOTES_API_DATASTORE_NAME: "{{ edx_notes_api_service_name }}"
 EDX_NOTES_API_MYSQL_DB_USER: notes001
 EDX_NOTES_API_MYSQL_DB_NAME: "{{ EDX_NOTES_API_DATASTORE_NAME }}"
 EDX_NOTES_API_MYSQL_DB_PASS: secret
 EDX_NOTES_API_MYSQL_HOST: localhost
 EDX_NOTES_API_ELASTICSEARCH_URL: http://127.0.0.1:9200
-EDX_NOTES_API_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-notes"
+EDX_NOTES_API_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}_{{ COMMON_DEPLOYMENT }}_notes"
 # Change these values!!
 EDX_NOTES_API_SECRET_KEY: "i^,9%i=e=y/Nlpb=Mkx!j&,HD9d/17F][9P,FLdwM2+G6|]BEU"
+<<<<<<< HEAD
 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_CLIENT_ID: edx_notes_id
+EDX_NOTES_API_CLIENT_SECRET: edx_notes_secret
+>>>>>>> Potentially risky dashes to underscores
 
 EDX_NOTES_API_DATABASES:
   # rw user
@@ -44,7 +49,7 @@ EDX_NOTES_API_REPOS:
   - PROTOCOL: "{{COMMON_GIT_PROTOCOL}}"
     DOMAIN: "{{COMMON_GIT_MIRROR}}"
     PATH: "{{COMMON_GIT_PATH}}"
-    REPO: edx-notes-api.git
+    REPO: "{{ edx_notes_api_service_name }}.git"
     VERSION: e0d/migration-overrides
     DESTINATION: "{{edx_notes_api_code_dir}}"
     SSH_KEY: "{{ EDX_NOTES_API_GIT_SSH_KEY }}"
@@ -61,7 +66,7 @@ edx_notes_api_service_config:
   CLIENT_ID: "{{ EDX_NOTES_API_CLIENT_ID }}"
   CLIENT_SECRET: "{{ EDX_NOTES_API_CLIENT_SECRET }}"
   ELASTICSEARCH_URL: "{{ EDX_NOTES_API_ELASTICSEARCH_URL }}"
-  ELASTICSEARCH_INDEX: "edx-notes"
+  ELASTICSEARCH_INDEX: "edx_notes"
   # Number of rows to return by default in result.
   RESULTS_DEFAULT_SIZE: 25
   # Max number of rows to return in result.