fixup! Fixing discovery for sandboxes

playbooks/edx_sandbox.yml

@@ -21,7 +21,6 @@
     edx_platform_version: 'master'
     # Set to false if deployed behind another proxy/load balancer.
     NGINX_SET_X_FORWARDED_HEADERS: True
-    DISCOVERY_URL_ROOT: 'http://localhost:{{ DISCOVERY_NGINX_PORT }}'
   roles:
     - role: swapfile
       SWAPFILE_SIZE: 4GB

playbooks/roles/discovery/defaults/main.yml

@@ -56,9 +56,10 @@ DISCOVERY_ELASTICSEARCH_INDEX_NAME: 'catalog'
 
 DISCOVERY_MEMCACHE: [ 'memcache' ]
 
-DISCOVERY_VERSION: "master"
+DISCOVERY_VERSION: 'master'
 DISCOVERY_DJANGO_SETTINGS_MODULE: "course_discovery.settings.production"
-DISCOVERY_URL_ROOT: 'http://discovery:{{ DISCOVERY_NGINX_PORT }}'
+DISCOVERY_HOSTNAME: 'localhost'
+DISCOVERY_URL_ROOT: 'http://{{ DISCOVERY_HOSTNAME }}:{{ DISCOVERY_NGINX_PORT }}'
 DISCOVERY_LOGOUT_URL: '{{ DISCOVERY_URL_ROOT }}/logout/'
 
 DISCOVERY_SECRET_KEY: 'Your secret key here'

playbooks/roles/discovery/meta/main.yml

@@ -50,3 +50,4 @@ dependencies:
     edx_django_service_extra_apps: '{{ DISCOVERY_EXTRA_APPS }}'
     edx_django_service_session_expire_at_browser_close: '{{ DISCOVERY_SESSION_EXPIRE_AT_BROWSER_CLOSE }}'
     edx_django_service_automated_users: '{{ DISCOVERY_AUTOMATED_USERS }}'
+    edx_django_service_hostname: '{{ DISCOVERY_HOSTNAME }}'

playbooks/vagrant-devstack.yml

@@ -18,7 +18,6 @@
     COMMON_SECURITY_UPDATES: true
     SECURITY_UPGRADE_ON_ANSIBLE: true
     MONGO_AUTH: false
-    DISCOVERY_URL_ROOT: 'http://localhost:{{ DISCOVERY_NGINX_PORT }}'
   vars_files:
     - roles/edxapp/vars/devstack.yml
   roles:

util/jenkins/ansible-provision.sh

@@ -295,6 +295,7 @@ CREDENTIALS_URL_ROOT: "https://{{ CREDENTIALS_DOMAIN }}"
 CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 
 discovery_create_demo_data: true
+DISCOVERY_HOSTNAME: "discovery-${deploy_host}"
 DISCOVERY_URL_ROOT: "https://discovery-${deploy_host}"
 DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 DISCOVERY_ECOMMERCE_URL_ROOT: "https://ecommerce-${deploy_host}"