Merge pull request #2431 from edx/clintonb/sandbox-fixes

Fixed programs sandbox configuration issues

playbooks/edx-east/edx_continuous_integration.yml

@@ -17,6 +17,7 @@
       - certs
       - analytics_api
       - ecommerce
+      - programs
       nginx_default_sites:
       - lms
     - mysql

playbooks/edx-east/oauth_client_setup.yml

@@ -7,5 +7,6 @@
     - "roles/edxapp/defaults/main.yml"
     - "roles/insights/defaults/main.yml"
     - "roles/ecommerce/defaults/main.yml"
+    - "roles/programs/defaults/main.yml"
   roles:
     - oauth_client_setup

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

@@ -36,8 +36,8 @@
 {{ role_name|upper }}_LANGUAGE_CODE: 'en-us'
 
 # Used to automatically configure OAuth2 Client
-{{ role_name|upper }}_SOCIAL_AUTH_EDX_OIDC_KEY : 'some-secret'
-{{ role_name|upper }}_SOCIAL_AUTH_EDX_OIDC_SECRET : 'some-secret'
+{{ role_name|upper }}_SOCIAL_AUTH_EDX_OIDC_KEY : '{{ role_name|lower }}-key'
+{{ role_name|upper }}_SOCIAL_AUTH_EDX_OIDC_SECRET : '{{ role_name|lower }}-secret'
 {{ role_name|upper }}_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 
 {{ role_name|upper }}_PLATFORM_NAME: 'Your Platform Name Here'

playbooks/roles/ecommerce/defaults/main.yml

@@ -52,8 +52,8 @@ ECOMMERCE_JWT_ISSUERS:
   - 'ecommerce_worker'
 
 # Used to automatically configure OAuth2 Client
-ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY : 'some-secret'
-ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET : 'some-secret'
+ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY : 'ecommerce-key'
+ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET : 'ecommerce-secret'
 ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 
 # Analytics related
@@ -154,7 +154,7 @@ ECOMMERCE_REPOS:
   - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
     DOMAIN: "{{ COMMON_GIT_MIRROR }}"
     PATH: "{{ COMMON_GIT_PATH }}"
-    REPO: edx-ecommerce.git
+    REPO: ecommerce.git
     VERSION: "{{ ECOMMERCE_VERSION }}"
     DESTINATION: "{{ ecommerce_code_dir }}"
     SSH_KEY: "{{ ECOMMERCE_GIT_IDENTITY }}"

playbooks/roles/launch_ec2/tasks/main.yml

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

playbooks/roles/oauth_client_setup/defaults/main.yml

@@ -30,7 +30,7 @@ oauth_client_setup_oauth2_clients:
         secret: "{{ INSIGHTS_OAUTH2_SECRET }}" 
       }
     - {
-        name: "{{ PROGRAMS_OAUTH2_APP_CLIENT_NAME | default('None') }}",
+        name: "{{ programs_service_name | default('None') }}",
         url_root: "{{ PROGRAMS_URL_ROOT }}",
         id: "{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY }}",
         secret: "{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}"

playbooks/roles/programs/defaults/main.yml

@@ -43,8 +43,8 @@ PROGRAMS_TIME_ZONE: 'UTC'
 PROGRAMS_LANGUAGE_CODE: 'en-us'
 
 # Used to automatically configure OAuth2 Client
-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY : 'some-secret'
-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET : 'some-secret'
+PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY : 'programs-key'
+PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET : 'programs-secret'
 PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 
 PROGRAMS_PLATFORM_NAME: 'Your Platform Name Here'

util/jenkins/ansible-provision.sh

@@ -155,14 +155,20 @@ ease_version: $ease_version
 certs_version: $certs_version
 discern_version: $discern_version
 configuration_version: $configuration_version
-ECOMMERCE_VERSION: $ecommerce_version
-PROGRAMS_VERSION: $programs_version
+
 EDXAPP_STATIC_URL_BASE: $static_url_base
 EDXAPP_LMS_NGINX_PORT: 80
 EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
 EDXAPP_CMS_NGINX_PORT: 80
+
 ECOMMERCE_NGINX_PORT: 80
 ECOMMERCE_SSL_NGINX_PORT: 443
+ECOMMERCE_VERSION: $ecommerce_version
+
+PROGRAMS_NGINX_PORT: 80
+PROGRAMS_SSL_NGINX_PORT: 443
+PROGRAMS_VERSION: $programs_version
+
 NGINX_SET_X_FORWARDED_HEADERS: True
 EDX_ANSIBLE_DUMP_VARS: true
 migrate_db: "yes"
@@ -172,6 +178,10 @@ rabbitmq_refresh: True
 COMMON_HOSTNAME: $dns_name
 COMMON_DEPLOYMENT: edx
 COMMON_ENVIRONMENT: sandbox
+
+nginx_default_sites:
+  - lms
+
 # User provided extra vars
 $extra_vars
 EOF
@@ -235,6 +245,7 @@ ECOMMERCE_ECOMMERCE_URL_ROOT: "https://ecommerce-${deploy_host}"
 ECOMMERCE_LMS_URL_ROOT: "https://${deploy_host}"
 ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 
+PROGRAMS_LMS_URL_ROOT: "https://${deploy_host}"
 PROGRAMS_URL_ROOT: "https://programs-${deploy_host}"
 PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 EOF