more changes

playbooks/edx-east/edx_continuous_integration.yml

@@ -16,7 +16,6 @@
       - analytics_api
       - ecommerce
       - credentials
-      - video_pipeline
       nginx_default_sites:
       - lms
     - mysql

playbooks/edx-east/video_pipeline.yml

@@ -8,6 +8,6 @@
   roles:
     - role: nginx
       nginx_default_sites:
-        - video_pipeline
+        - pipeline
     - aws
     - role: video_pipeline

playbooks/roles/launch_ec2/tasks/main.yml

@@ -89,7 +89,7 @@
   delay: 30
   with_nested:
     - "{{ ec2.instances }}"
-    - ['studio', 'ecommerce', 'preview', 'discovery', 'credentials']
+    - ['studio', 'ecommerce', 'preview', 'discovery', 'credentials', 'pipeline']
 
 - name: Add new instance to host group
   local_action:

playbooks/roles/oauth_client_setup/defaults/main.yml

@@ -45,6 +45,13 @@ oauth_client_setup_oauth2_clients:
         secret: "{{ DISCOVERY_SOCIAL_AUTH_EDX_OIDC_SECRET | default('None') }}",
         logout_uri: "{{ DISCOVERY_LOGOUT_URL | default('None') }}"
       }
+    - {
+        name: "{{ video_pipeline_service_name | default('None') }}",
+        url_root: "{{ VIDEO_PIPELINE_URL_ROOT | default('None') }}",
+        id: "{{ VIDEO_PIPELINE_SOCIAL_AUTH_EDX_OIDC_KEY | default('None') }}",
+        secret: "{{ VIDEO_PIPELINE_SOCIAL_AUTH_EDX_OIDC_SECRET | default('None') }}",
+        logout_uri: "{{ VIDEO_PIPELINE_LOGOUT_URL | default('None') }}"
+      }
 
 #
 # OS packages

playbooks/roles/video_pipeline/defaults/main.yml

@@ -15,7 +15,7 @@
 #
 # vars are namespace with the module name.
 #
-video_pipeline_service_name: "video_pipeline"
+video_pipeline_service_name: "pipeline"
 video_pipeline_gunicorn_port: 8555
 
 video_pipeline_user: "{{ video_pipeline_service_name }}"
@@ -51,7 +51,8 @@ VIDEO_PIPELINE_MEMCACHE: []
 
 VIDEO_PIPELINE_VERSION: "master"
 VIDEO_PIPELINE_DJANGO_SETTINGS_MODULE: "VEDA.settings"
-VIDEO_PIPELINE_URL_ROOT: "http://pipeline:{{ VIDEO_PIPELINE_NGINX_PORT }}"
+VIDEO_PIPELINE_DOMAIN: 'pipeline'
+VIDEO_PIPELINE_URL_ROOT: "http://{{ VIDEO_PIPELINE_DOMAIN }}:{{ VIDEO_PIPELINE_NGINX_PORT }}"
 VIDEO_PIPELINE_LOGOUT_URL: "{{ VIDEO_PIPELINE_URL_ROOT }}/logout/"
 
 VIDEO_PIPELINE_SECRET_KEY: "Your secret key here"
@@ -71,6 +72,8 @@ VIDEO_PIPELINE_MEDIA_STORAGE_BACKEND:
   MEDIA_ROOT: "{{ VIDEO_PIPELINE_MEDIA_ROOT }}"
   MEDIA_URL: "{{ VIDEO_PIPELINE_MEDIA_URL }}"
 
+VIDEO_PIPELINE_SERVICE_USER: 'pipeline_service_user'
+
 VIDEO_PIPELINE_STATICFILES_STORAGE: "django.contrib.staticfiles.storage.StaticFilesStorage"
 
 VIDEO_PIPELINE_HOSTNAME: '~^((stage|prod)-)?pipeline.*'
@@ -96,7 +99,7 @@ VIDEO_PIPELINE_VEDA_UPLOAD_BUCKET: "SET-ME-PLEASE"
 VIDEO_PIPELINE_VEDA_S3_HOTSTORE_BUCKET: "SET-ME-PLEASE"
 VIDEO_PIPELINE_VEDA_DELIVERABLE_BUCKET: "SET-ME-PLEASE"
 
-VIDEO_PIPELINE_VEDA_BASE_URL: "SET-ME-PLEASE"
+VIDEO_PIPELINE_VEDA_BASE_URL: "{{ VIDEO_PIPELINE_URL_ROOT }}"
 VIDEO_PIPELINE_VEDA_ACCESS_KEY_ID: "SET-ME-PLEASE"
 VIDEO_PIPELINE_VEDA_SECRET_ACCESS_KEY: "SET-ME-PLEASE"
 
@@ -127,8 +130,8 @@ VIDEO_PIPELINE_VAL_TRANSCRIPT_CREATE_URL: "{{ VIDEO_PIPELINE_VAL_BASE_URL }}/api
 VIDEO_PIPELINE_VAL_VIDEO_TRANSCRIPT_STATUS_URL: "{{ VIDEO_PIPELINE_VAL_BASE_URL }}/api/val/v0/videos/status/"
 
 VIDEO_PIPELINE_RABBITMQ_BROKER: "localhost"
-VIDEO_PIPELINE_RABBITMQ_PASS: "veda"
-VIDEO_PIPELINE_RABBITMQ_USER: "veda"
+VIDEO_PIPELINE_RABBITMQ_PASS: "pipeline"
+VIDEO_PIPELINE_RABBITMQ_USER: "pipeline"
 
 VIDEO_PIPELINE_SG_SERVER_PATH: "SET-ME-PLEASE"
 VIDEO_PIPELINE_SG_SCRIPT_NAME: "SET-ME-PLEASE"

util/jenkins/ansible-provision.sh

@@ -305,6 +305,11 @@ COURSE_DISCOVERY_ECOMMERCE_API_URL: "https://ecommerce-${deploy_host}/api/v2"
 DISCOVERY_URL_ROOT: "https://discovery-${deploy_host}"
 DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 
+VIDEO_PIPELINE_DOMAIN: "pipeline-${deploy_host}"
+VIDEO_PIPELINE_URL_ROOT: "https://{{ VIDEO_PIPELINE_DOMAIN }}"
+VIDEO_PIPELINE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
+VIDEO_PIPELINE_VAL_BASE_URL: "{{ EDXAPP_CMS_BASE }}"
+
 EOF
 fi