variable defaults + sandbox hack

playbooks/edx-east/video_pipeline.yml

@@ -10,5 +10,5 @@
     - role: nginx
       nginx_default_sites:
         - video_pipeline
-    - edxlocal
+    - aws
     - role: video_pipeline

playbooks/roles/video_pipeline/defaults/main.yml

@@ -81,53 +81,55 @@ VIDEO_PIPELINE_EXTRA_APPS: []
 VIDEO_PIPELINE_AUTOMATED_USERS: {}
 
 # instance_config.yaml variable overrides
-# TODO! add sane default values for below variables
-VIDEO_PIPELINE_EDX_S3_INGEST_PREFIX: "SET-ME-PLEASE"
-VIDEO_PIPELINE_EDX_S3_INGEST_BUCKET: "video_pipeline_edx_s3_ingest_bucket"
-VIDEO_PIPELINE_EDX_S3_ENDPOINT_BUCKET: "video_pipeline_edx_s3_endpoint_bucket"
-
-VIDEO_PIPELINE_EDX_CLOUDFRONT_PREFIX: "video_pipeline_edx_cloudfront_prefix"
-VIDEO_PIPELINE_VEDA_S3_UPLOAD_BUCKET: "video_pipeline_veda_s3_upload_bucket"
-VIDEO_PIPELINE_VEDA_S3_HOTSTORE_BUCKET: "video_pipeline_veda_s3_hotstore_bucket"
-VIDEO_PIPELINE_VEDA_DELIVERABLE_BUCKET: "video_pipeline_veda_deliverable_bucket"
-VIDEO_PIPELINE_VEDA_BASE_URL: "veda.edx.org"
-VIDEO_PIPELINE_VEDA_SECRET_ACCESS_KEY: "video_pipeline_veda_secret_access_key"
-VIDEO_PIPELINE_VEDA_ACCESS_KEY_ID: "video_pipeline_veda_access_key_id"
-VIDEO_PIPELINE_VEDA_NOREPLY_EMAIL: "video_pipeline_veda_noreply_email"
-
-VIDEO_PIPELINE_AWS_VIDEO_IMAGES_BUCKET: "video_pipeline_aws_video_images_bucket"
-VIDEO_PIPELINE_AWS_VIDEO_TRANSCRIPTS_BUCKET: "video_pipeline_aws_video_transcripts_bucket"
-
-VIDEO_PIPELINE_ADMIN_EMAIL: "video_pipeline_admin_email"
-
-VIDEO_PIPELINE_CIELO24_API_ENVIRONMENT: "video_pipeline_cielo24_api_environment"
-VIDEO_PIPELINE_TRANSCRIPT_PROVIDER_REQUEST_TOKEN: "video_pipeline_transcript_provider_request_token"
-
-VIDEO_PIPELINE_VEDA_API_URL: "video_pipeline_veda_api_url"
-VIDEO_PIPELINE_VEDA_AUTH_URL: "video_pipeline_veda_auth_url"
-VIDEO_PIPELINE_VEDA_CLIENT_ID: "video_pipeline_veda_client_id"
-VIDEO_PIPELINE_VEDA_SECRET_KEY: "video_pipeline_veda_secret_key"
-VIDEO_PIPELINE_VEDA_TOKEN_URL: "video_pipeline_veda_token_url"
-
-VIDEO_PIPELINE_VAL_API_URL: "video_pipeline_val_api_url"
-VIDEO_PIPELINE_VAL_TOKEN_URL: "video_pipeline_val_token_url"
-VIDEO_PIPELINE_VAL_VIDEO_IMAGES_URL: "video_pipeline_val_video_images_url"
-VIDEO_PIPELINE_VAL_CLIENT_ID: "video_pipeline_val_client_id"
-VIDEO_PIPELINE_VAL_SECRET_KEY: "video_pipeline_val_secret_key"
-VIDEO_PIPELINE_VAL_PASSWORD: "video_pipeline_val_password"
-VIDEO_PIPELINE_VAL_USERNAME: "video_pipeline_val_username"
-VIDEO_PIPELINE_VAL_TRANSCRIPT_CREATE_URL: "video_pipeline_val_transcript_create_url"
-VIDEO_PIPELINE_VAL_VIDEO_TRANSCRIPT_STATUS_URL: "video_pipeline_val_video_transcript_status_url"
+
+VIDEO_PIPELINE_EDX_CLOUDFRONT_PREFIX: "SET-ME-PLEASE"
+VIDEO_PIPELINE_EDX_S3_INGEST_PREFIX: "ingest/"
+VIDEO_PIPELINE_EDX_S3_INGEST_BUCKET: "SET-ME-PLEASE"
+VIDEO_PIPELINE_EDX_S3_ENDPOINT_BUCKET: "SET-ME-PLEASE"
+VIDEO_PIPELINE_VEDA_S3_UPLOAD_BUCKET: "SET-ME-PLEASE"
+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_ACCESS_KEY_ID: "SET-ME-PLEASE"
+VIDEO_PIPELINE_VEDA_SECRET_ACCESS_KEY: "SET-ME-PLEASE"
+
+VIDEO_PIPELINE_AWS_VIDEO_IMAGES_BUCKET: "SET-ME-PLEASE"
+VIDEO_PIPELINE_AWS_VIDEO_TRANSCRIPTS_BUCKET: "SET-ME-PLEASE"
+
+VIDEO_PIPELINE_ADMIN_EMAIL: "veda@example.com"
+VIDEO_PIPELINE_VEDA_NOREPLY_EMAIL: "veda-noreply@example.com"
+
+VIDEO_PIPELINE_CIELO24_API_ENVIRONMENT: "sandbox"
+VIDEO_PIPELINE_TRANSCRIPT_PROVIDER_REQUEST_TOKEN: "SET-ME-TO-A-UNIQUE-LONG-RANDOM-STRING"
+
+VIDEO_PIPELINE_VEDA_API_URL: "{{ VIDEO_PIPELINE_VEDA_BASE_URL }}/api"
+VIDEO_PIPELINE_VEDA_AUTH_URL: "{{ VIDEO_PIPELINE_VEDA_BASE_URL }}/veda_auth"
+VIDEO_PIPELINE_VEDA_CLIENT_ID: "SET-ME-PLEASE"
+VIDEO_PIPELINE_VEDA_SECRET_KEY: "SET-ME-PLEASE"
+VIDEO_PIPELINE_VEDA_TOKEN_URL: "{{ VIDEO_PIPELINE_VEDA_BASE_URL }}/o/token"
+
+VIDEO_PIPELINE_VAL_BASE_URL: "http://127.0.0.1:8010"
+VIDEO_PIPELINE_VAL_API_URL: "{{ VIDEO_PIPELINE_VAL_BASE_URL }}/api/val/v0/videos"
+VIDEO_PIPELINE_VAL_TOKEN_URL: "{{ VIDEO_PIPELINE_VAL_BASE_URL }}/oauth2/access_token"
+VIDEO_PIPELINE_VAL_VIDEO_IMAGES_URL: "{{ VIDEO_PIPELINE_VAL_BASE_URL }}/api/val/v0/videos/video-images/update/"
+VIDEO_PIPELINE_VAL_CLIENT_ID: "SET-ME-PLEASE"
+VIDEO_PIPELINE_VAL_SECRET_KEY: "SET-ME-PLEASE"
+VIDEO_PIPELINE_VAL_USERNAME: "staff"
+VIDEO_PIPELINE_VAL_PASSWORD: "edx"
+VIDEO_PIPELINE_VAL_TRANSCRIPT_CREATE_URL: "{{ VIDEO_PIPELINE_VAL_BASE_URL }}/api/val/v0/videos/video-transcripts/create/"
+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_SG_SERVER_PATH: "video_pipeline_sg_server_path"
-VIDEO_PIPELINE_SG_SCRIPT_NAME: "video_pipeline_sg_script_name"
-VIDEO_PIPELINE_SG_SCRIPT_KEY: "video_pipeline_sg_script_key"
+VIDEO_PIPELINE_SG_SERVER_PATH: "SET-ME-PLEASE"
+VIDEO_PIPELINE_SG_SCRIPT_NAME: "SET-ME-PLEASE"
+VIDEO_PIPELINE_SG_SCRIPT_KEY: "SET-ME-PLEASE"
 
-VIDEO_PIPELINE_THREEPLAY_FTPHOST: "video_pipeline_threeplay_ftphost"
+VIDEO_PIPELINE_THREEPLAY_FTPHOST: "SET-ME-PLEASE"
 
-VIDEO_PIPELINE_XUETANG_API_URL: "video_pipeline_xuetang_api_url"
-VIDEO_PIPELINE_XUETANG_API_SHARED_SECRET: "video_pipeline_xuetang_api_shared_secret"
+VIDEO_PIPELINE_XUETANG_API_URL: "SET-ME-PLEASE"
+VIDEO_PIPELINE_XUETANG_API_SHARED_SECRET: "SET-ME-PLEASE"

playbooks/roles/video_pipeline/templates/instance_config.yaml.j2

@@ -38,6 +38,7 @@ aws_video_images_prefix: "video-images/"
 veda_s3_upload_bucket: '{{ VIDEO_PIPELINE_VEDA_S3_UPLOAD_BUCKET }}'
 veda_s3_hotstore_bucket: '{{ VIDEO_PIPELINE_VEDA_S3_HOTSTORE_BUCKET }}'
 veda_deliverable_bucket: '{{ VIDEO_PIPELINE_VEDA_DELIVERABLE_BUCKET }}'
+veda_upload_bucket: '{{ VIDEO_PIPELINE_VEDA_UPLOAD_BUCKET }}'
 # Settings
 multi_upload_barrier: 2000000000
 veda_base_url: '{{ VIDEO_PIPELINE_VEDA_BASE_URL }}'

util/jenkins/ansible-provision.sh

@@ -204,6 +204,10 @@ CREDENTIALS_NGINX_PORT: 80
 CREDENTIALS_SSL_NGINX_PORT: 443
 CREDENTIALS_VERSION: $credentials_version
 
+VIDEO_PIPELINE_NGINX_PORT: 80
+VIDEO_PIPELINE_SSL_NGINX_PORT: 443
+VIDEO_PIPELINE_VERSION: ammar/changes-for-config
+
 DISCOVERY_NGINX_PORT: 80
 DISCOVERY_SSL_NGINX_PORT: 443
 DISCOVERY_VERSION: $discovery_version
@@ -346,10 +350,14 @@ EOF
     fi
 fi
 
-declare -A deploy
-roles="edxapp forum ecommerce credentials discovery notifier xqueue xserver certs demo testcourses"
+video_pipeline="true"
 
+declare -A deploy
+roles="edxapp forum ecommerce credentials discovery video_pipeline notifier xqueue xserver certs demo testcourses"
+echo "Roles ====>"
+echo $roles
 for role in $roles; do
+    echo $role
     deploy[$role]=${!role}
 done