modified the name inside all playbooks

docker/build/course-discovery/Dockerfile → docker/build/discovery/Dockerfile

@@ -2,7 +2,7 @@
 #
 # From the root of configuration:
 #
-# docker build -f docker/build/course-discovery/Dockerfile .
+# docker build -f docker/build/discovery/Dockerfile .
 #
 # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
 # with the currently checked-out configuration repo.
@@ -10,19 +10,19 @@
 FROM edxops/trusty-common:latest
 MAINTAINER edxops
 
-ENV COURSE_DISCOVERY_VERSION=master
+ENV DISCOVERY_VERSION=master
 ENV REPO_OWNER=edx
 
 ADD . /edx/app/edx_ansible/edx_ansible
 
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 
-COPY docker/build/course-discovery/ansible_overrides.yml /
-RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook course_discovery.yml \
+COPY docker/build/discovery/ansible_overrides.yml /
+RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook discovery.yml \
     -c local -i '127.0.0.1,' \
     -t 'install,assets,devstack:install' \
     --extra-vars="@/ansible_overrides.yml" \
-    --extra-vars="COURSE_DISCOVERY_VERSION=$COURSE_DISCOVERY_VERSION" \
+    --extra-vars="DISCOVERY_VERSION=$DISCOVERY_VERSION" \
     --extra-vars="COMMON_GIT_PATH=$REPO_OWNER"
 
 USER root 

docker/build/discovery/ansible_overrides.yml

+---
+discovery_gunicorn_host: 0.0.0.0
+DISCOVERY_MYSQL: 'db'
+DISCOVERY_DJANGO_SETTINGS_MODULE: 'discovery.settings.devstack'
+DISCOVERY_ELASTICSEARCH_HOST: 'es'
+

docker/compose/edx/docker-compose.yml

@@ -14,9 +14,9 @@
 # structure under /home/me
 #
 # |-- edx-src
-# |   |-- course-discovery
+# |   |-- discovery
 # |   |-- cs_comments_service
-# |   |-- edx_course_discovery
+# |   |-- edx_discovery
 # |   |-- edx-platform
 # |   |-- xqueue
 

docker/plays/course_discovery.yml → docker/plays/discovery.yml

-- name: Deploy Course Discovery
+- name: Deploy Discovery
   hosts: all
   sudo: True
   gather_facts: True
@@ -7,6 +7,6 @@
   serial: "{{ serial_count }}"
   roles:
     - nginx
-    - role: course_discovery
+    - role: discovery
       nginx_default_sites:
-        - course_discovery
\ No newline at end of file
+        - discovery
\ No newline at end of file

playbooks/edx-east/course_discovery.yml

@@ -6,13 +6,13 @@
     ENABLE_DATADOG: False
     ENABLE_SPLUNKFORWARDER: False
     ENABLE_NEWRELIC: False
-    CLUSTER_NAME: 'course-discovery'
+    CLUSTER_NAME: 'discovery'
   roles:
     - aws
     - role: nginx
       nginx_default_sites:
-        - course-discovery
-    - course_discovery
+        - discovery
+    - discovery
     - role: datadog
       when: COMMON_ENABLE_DATADOG
     - role: splunkforwarder

playbooks/roles/launch_ec2/tasks/main.yml

@@ -78,8 +78,7 @@
     value: "{{ item[0].public_dns_name }}"
   with_nested:
     - ec2.instances
-    - ['studio', 'ecommerce', 'preview', 'programs', 'course-discovery', 'credentials']
-
+    - ['studio', 'ecommerce', 'preview', 'programs', 'discovery', 'credentials']
 
 - name: Add new instance to host group
   local_action:

util/jenkins/ansible-provision.sh

@@ -175,10 +175,9 @@ CREDENTIALS_NGINX_PORT: 80
 CREDENTIALS_SSL_NGINX_PORT: 443
 CREDENTIALS_VERSION: $credentials_version
 
-COURSE_DISCOVERY_NGINX_PORT: 80
-COURSE_DISCOVERY_SSL_NGINX_PORT: 443
-COURSE_DISCOVERY_VERSION: $course_discovery_version
-
+DISCOVERY_NGINX_PORT: 80
+DISCOVERY_SSL_NGINX_PORT: 443
+DISCOVERY_VERSION: $discovery_version
 NGINX_SET_X_FORWARDED_HEADERS: True
 NGINX_REDIRECT_TO_HTTPS: True
 EDX_ANSIBLE_DUMP_VARS: true
@@ -260,6 +259,7 @@ PROGRAMS_LMS_URL_ROOT: "https://${deploy_host}"
 PROGRAMS_URL_ROOT: "https://programs-${deploy_host}"
 PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 
+<<<<<<< HEAD
 CREDENTIALS_LMS_URL_ROOT: "https://${deploy_host}"
 CREDENTIALS_URL_ROOT: "https://credentials-${deploy_host}"
 CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
@@ -268,6 +268,11 @@ COURSE_DISCOVERY_ECOMMERCE_API_URL: "https://ecommerce-${deploy_host}/api/v2"
 COURSE_DISCOVERY_OAUTH_URL_ROOT: "https://${deploy_host}"
 COURSE_DISCOVERY_URL_ROOT: "https://course-discovery-${deploy_host}"
 COURSE_DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
+=======
+DISCOVERY_OAUTH_URL_ROOT: "https://${deploy_host}"
+DISCOVERY_URL_ROOT: "https://discovery-${deploy_host}"
+DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
+>>>>>>> 5f930fc... modified the name inside all playbooks
 
 EOF
 fi
@@ -313,7 +318,11 @@ EOF
 fi
 
 declare -A deploy
+<<<<<<< HEAD
 roles="edxapp forum ecommerce programs credentials course_discovery notifier xqueue xserver certs demo testcourses"
+=======
+roles="edxapp forum ecommerce programs discovery notifier xqueue xserver certs demo testcourses"
+>>>>>>> 5f930fc... modified the name inside all playbooks
 for role in $roles; do
     deploy[$role]=${!role}
 done