Refactor credentials_url_root

Refactor credentials_url_root to reference CREDENTIALS_DOMAIN (since the
former just adds a protocol and port) and change it to a lowercase var
to convey that it shouldn't be overridden.

playbooks/roles/credentials/defaults/main.yml

@@ -46,8 +46,7 @@ CREDENTIALS_CACHES:
     LOCATION: '{{ CREDENTIALS_MEMCACHE }}'
 
 CREDENTIALS_DJANGO_SETTINGS_MODULE: "credentials.settings.production"
-CREDENTIALS_DOMAIN: 'credentials.example.com'
-CREDENTIALS_URL_ROOT: 'http://credentials:18150'
+CREDENTIALS_DOMAIN: 'credentials'
 CREDENTIALS_OAUTH_URL_ROOT: 'http://127.0.0.1:8000'
 
 CREDENTIALS_SECRET_KEY: 'SET-ME-TO-A-UNIQUE-LONG-RANDOM-STRING'
@@ -224,6 +223,8 @@ credentials_requirements:
   - production.txt
   - optional.txt
 
+credentials_url_root: 'http://{{ CREDENTIALS_DOMAIN }}:18150'
+
 #
 # OS packages
 #

playbooks/roles/oauth_client_setup/defaults/main.yml

@@ -37,7 +37,7 @@ oauth_client_setup_oauth2_clients:
       }
     - {
         name: "{{ credentials_service_name | default('None') }}",
-        url_root: "{{ CREDENTIALS_URL_ROOT }}",
+        url_root: "{{ credentials_url_root }}",
         id: "{{ CREDENTIALS_SOCIAL_AUTH_EDX_OIDC_KEY }}",
         secret: "{{ CREDENTIALS_SOCIAL_AUTH_EDX_OIDC_SECRET }}"
       }

util/jenkins/ansible-provision.sh

@@ -277,7 +277,7 @@ PROGRAMS_URL_ROOT: "https://programs-${deploy_host}"
 PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 
 CREDENTIALS_LMS_URL_ROOT: "https://${deploy_host}"
-CREDENTIALS_URL_ROOT: "https://credentials-${deploy_host}"
+CREDENTIALS_DOMAIN: "credentials-${deploy_host}"
 CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 COURSE_DISCOVERY_ECOMMERCE_API_URL: "https://ecommerce-${deploy_host}/api/v2"