fix feedback from ed

docker/build/course-discovery/ansible_overrides.yml

@@ -3,5 +3,5 @@ course_discovery_gunicorn_host: 0.0.0.0
 COURSE_DISCOVERY_MYSQL: 'db'
 COURSE_DISCOVERY_DJANGO_SETTINGS_MODULE: 'course_discovery.settings.devstack'
 COURSE_DISCOVERY_ELASTICSEARCH_HOST: 'es'
-COURSE_DISCOVERY_MYSQL_LOGIN_HOST: '%'
+COURSE_DISCOVERY_MYSQL_MATCHER: '%'
 

docker/build/credentials/ansible_overrides.yml

@@ -2,5 +2,5 @@
 credentials_gunicorn_host: 127.0.0.1
 CREDENTIALS_MYSQL: 'db'
 CREDENTIALS_DJANGO_SETTINGS_MODULE: 'credentials.settings.devstack'
-CREDENTIALS_MYSQL_LOGIN_HOST: '%'
+CREDENTIALS_MYSQL_MATCHER: '%'
 

docker/build/credentials/inventory

-[local]
-localhost

docker/plays/credentials.yml

@@ -7,6 +7,7 @@
   serial: "{{ serial_count }}"
   roles:
     - nginx
+    - docker
     - role: credentials
       nginx_default_sites:
         - credentials

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

@@ -32,7 +32,7 @@
 
 {{ role_name|upper }}_DB_ADMIN_USER: 'root'
 {{ role_name|upper }}_DB_ADMIN_PASSWORD: ''
-{{ role_name|upper }}_MYSQL_LOGIN_HOST: 'localhost'
+{{ role_name|upper }}_MYSQL_MATCHER: 'localhost'
 
 {{ role_name|upper }}_MEMCACHE: [ 'memcache' ]
 

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

@@ -2,5 +2,5 @@
 {{ role_name }}_gunicorn_host: 127.0.0.1
 {{ role_name|upper }}_MYSQL: 'db'
 {{ role_name|upper }}_DJANGO_SETTINGS_MODULE: '{{ role_name }}.settings.devstack'
-{{ role_name|upper }}_MYSQL_LOGIN_HOST: '%'
+{{ role_name|upper }}_MYSQL_MATCHER: '%'
 

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

@@ -80,7 +80,7 @@
     login_user: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_USER }}"
     login_password: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_PASSWORD }}"
     name: "{{ '{{' }} item.name }}"
-    host: "{{ '{{' }} {{ role_name|upper }}_MYSQL_LOGIN_HOST }}"
+    host: "{{ '{{' }} {{ role_name|upper }}_MYSQL_MATCHER }}"
     password: "{{ '{{' }} item.password }}"
     priv: "{{ '{{' }} {{ role_name|upper }}_DEFAULT_DB_NAME }}.*:ALL"
   with_items:

playbooks/roles/course_discovery/defaults/main.yml

@@ -46,7 +46,7 @@ COURSE_DISCOVERY_ELASTICSEARCH:
 
 COURSE_DISCOVERY_DB_ADMIN_USER: 'root'
 COURSE_DISCOVERY_DB_ADMIN_PASSWORD: ''
-COURSE_DISCOVERY_MYSQL_LOGIN_HOST: 'localhost'
+COURSE_DISCOVERY_MYSQL_MATCHER: 'localhost'
 
 COURSE_DISCOVERY_MEMCACHE: [ 'memcache' ]
 

playbooks/roles/course_discovery/tasks/main.yml

@@ -102,7 +102,7 @@
     login_user: "{{ COURSE_DISCOVERY_DB_ADMIN_USER }}"
     login_password: "{{ COURSE_DISCOVERY_DB_ADMIN_PASSWORD }}"
     name: "{{ item.name }}"
-    host: "{{ COURSE_DISCOVERY_MYSQL_LOGIN_HOST }}"
+    host: "{{ COURSE_DISCOVERY_MYSQL_MATCHER }}"
     password: "{{ item.password }}"
     priv: "{{ COURSE_DISCOVERY_DEFAULT_DB_NAME }}.*:ALL"
   with_items:

playbooks/roles/credentials/defaults/main.yml

@@ -39,7 +39,7 @@ CREDENTIALS_DATABASES:
 
 CREDENTIALS_DB_ADMIN_USER: 'root'
 CREDENTIALS_DB_ADMIN_PASSWORD: ''
-CREDENTIALS_MYSQL_LOGIN_HOST: 'localhost'
+CREDENTIALS_MYSQL_MATCHER: 'localhost'
 
 CREDENTIALS_MEMCACHE: [ 'memcache' ]
 
@@ -56,7 +56,7 @@ CREDENTIALS_OAUTH_URL_ROOT: 'http://127.0.0.1:8000'
 
 CREDENTIALS_SECRET_KEY: 'Your secret key here'
 CREDENTIALS_TIME_ZONE: 'UTC'
-CREDENTIALS_LANGUAGE_CODE: 'en-us'
+CREDENTIALS_LANGUAGE_CODE: 'en_US.UTF-8'
 
 # Used to automatically configure OAuth2 Client
 CREDENTIALS_SOCIAL_AUTH_EDX_OIDC_KEY : 'credentials-key'
@@ -107,7 +107,7 @@ CREDENTIALS_GUNICORN_WORKER_CLASS: "gevent"
 
 CREDENTIALS_HOSTNAME: '~^((stage|prod)-)?credentials.*'
 
-nginx_credentials_gunicorn_hosts:
+NGINX_CREDENTIALS_GUNICORN_HOSTS:
   - 127.0.0.1
 
 #
@@ -123,7 +123,7 @@ credentials_migration_environment:
   DB_MIGRATION_USER: "{{ COMMON_MYSQL_MIGRATE_USER }}"
   DB_MIGRATION_PASS: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
 
-credentials_service_name: "credentials"
+credentials_service_name: "{{ credentials_role_name }}"
 credentials_user: "{{ credentials_service_name }}"
 credentials_home: "{{ COMMON_APP_DIR }}/{{ credentials_service_name }}"
 credentials_code_dir: "{{ credentials_home }}/{{ credentials_service_name }}"

playbooks/roles/credentials/tasks/main.yml

@@ -96,7 +96,7 @@
     login_user: "{{ CREDENTIALS_DB_ADMIN_USER }}"
     login_password: "{{ CREDENTIALS_DB_ADMIN_PASSWORD }}"
     name: "{{ item.name }}"
-    host: "{{ CREDENTIALS_MYSQL_LOGIN_HOST }}"
+    host: "{{ CREDENTIALS_MYSQL_MATCHER }}"
     password: "{{ item.password }}"
     priv: "{{ CREDENTIALS_DEFAULT_DB_NAME }}.*:ALL"
   with_items:

playbooks/roles/credentials/templates/edx/app/nginx/sites-available/credentials.j2

@@ -10,7 +10,7 @@
 {% endif %}
 
 upstream credentials_app_server {
-{% for host in nginx_credentials_gunicorn_hosts %}
+{% for host in NGINX_CREDENTIALS_GUNICORN_HOSTS %}
     server {{ host }}:{{ credentials_gunicorn_port }} fail_timeout=0;
 {% endfor %}
 }

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/credentials.j2

@@ -10,7 +10,7 @@
 {% endif %}
 
 upstream credentials_app_server {
-{% for host in nginx_credentials_gunicorn_hosts %}
+{% for host in NGINX_CREDENTIALS_GUNICORN_HOSTS %}
     server {{ host }}:{{ credentials_gunicorn_port }} fail_timeout=0;
 {% endfor %}
 }