refactoring

playbooks/edx-east/video_pipeline.yml

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

playbooks/roles/video_common_vars/tasks/main.yml

+---
+#
+# edX Configuration
+#
+# github:     https://github.com/edx/configuration
+# wiki:       https://openedx.atlassian.net/wiki/display/OpenOPS
+# code style: https://openedx.atlassian.net/wiki/display/OpenOPS/Ansible+Code+Conventions
+# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
+#
+#
+#
+# Tasks for role video_common
+#
+#
+
+- name: Write out app config file
+  template:
+    src: "config.yml.j2"
+    dest: "{{ COMMON_CFG_DIR  }}/{{ video_common_service_name }}.yml"
+    mode: "0644"

playbooks/roles/video_common_vars/templates/config.yml.j2

+---
+# {{ ansible_managed }}
+
+{{ VIDEO_COMMON_CONFIG | to_nice_yaml }}

playbooks/roles/video_pipeline/defaults/main.yml

@@ -36,6 +36,7 @@ video_pipeline_deliver_worker: "{{ video_pipeline_service_name }}_deliver"
 video_pipeline_debian_pkgs:
   - libffi6
   - libffi-dev
+  - ffmpeg
 
 VIDEO_PIPELINE_HOST_ENVIRONMENT: 'sandbox'
 
@@ -80,9 +81,6 @@ VIDEO_PIPELINE_STATICFILES_STORAGE: "django.contrib.staticfiles.storage.StaticFi
 
 VIDEO_PIPELINE_HOSTNAME: '~^((stage|prod)-)?pipeline.*'
 
-NGINX_VIDEO_PIPELINE_GUNICORN_HOSTS:
-  - 127.0.0.1
-
 VIDEO_PIPELINE_GUNICORN_EXTRA: ""
 
 VIDEO_PIPELINE_EXTRA_APPS: []

playbooks/roles/video_pipeline/meta/main.yml

@@ -19,14 +19,6 @@
 #   my_role_var1: 'bar'
 # }
 dependencies:
-  - role: video_common_vars
-    VEDA_STATIC_ROOT: '{{ VIDEO_PIPELINE_STATIC_ROOT }}'
-    VEDA_DJANGO_SECRET_KEY: '{{ VIDEO_PIPELINE_SECRET_KEY }}'
-    VEDA_MYSQL_DB_NAME: '{{ VIDEO_PIPELINE_DEFAULT_DB_NAME }}'
-    VEDA_MYSQL_HOST: '{{ VIDEO_PIPELINE_MYSQL_HOST }}'
-    VEDA_MYSQL_USER: '{{ VIDEO_PIPELINE_MYSQL_USER }}'
-    VEDA_MYSQL_PASSWORD: '{{ VIDEO_PIPELINE_MYSQL_PASSWORD }}'
-    VEDA_URL_ROOT: '{{ VIDEO_PIPELINE_URL_ROOT }}'
   - role: edx_django_service
     edx_django_service_repo: 'edx-video-pipeline'
     edx_django_service_version: '{{ VIDEO_PIPELINE_VERSION }}'
@@ -57,5 +49,13 @@ dependencies:
     edx_django_service_extra_apps: '{{ VIDEO_PIPELINE_EXTRA_APPS }}'
     edx_django_service_automated_users: '{{ VIDEO_PIPELINE_AUTOMATED_USERS }}'
     edx_django_service_use_python3: false
-    nginx_edx_django_service_gunicorn_hosts: '{{ NGINX_VIDEO_PIPELINE_GUNICORN_HOSTS }}'
-    edx_django_service_config: '{{ VEDA_COMMON_CONFIG }}'
+    edx_django_service_config: {}
+  - role: video_common_vars
+    video_common_service_name: '{{ video_pipeline_service_name }}'
+    video_common_veda_url_root: '{{ VIDEO_PIPELINE_URL_ROOT }}'
+    video_common_veda_static_root: '{{ VIDEO_PIPELINE_STATIC_ROOT }}'
+    video_common_veda_django_secret_key: '{{ VIDEO_PIPELINE_SECRET_KEY }}'
+    video_common_veda_mysql_db_name: '{{ VIDEO_PIPELINE_DEFAULT_DB_NAME }}'
+    video_common_veda_mysql_host: '{{ VIDEO_PIPELINE_MYSQL_HOST }}'
+    video_common_veda_mysql_user: '{{ VIDEO_PIPELINE_MYSQL_USER }}'
+    video_common_veda_mysql_password: '{{ VIDEO_PIPELINE_MYSQL_PASSWORD }}'