Merge pull request #1990 from Sunbird-Knowlg/mediakind

Issue KN-1096 feat: Removed unused AMS variables

Author: pallakartheekreddy

kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml

@@ -79,13 +79,6 @@ certificate_generator_parallelism: 1
 
 ### Video stream generator related vars
 ### IMPORTANT: The media-service configuration values should be updated in respective environment.
-video_stream_generator_azure_tenant: "{{ media_service_azure_tenant | default('') }}"
-video_stream_generator_azure_subscription_id: "{{ media_service_azure_subscription_id | default('') }}"
-video_stream_generator_azure_account_name: "{{ media_service_azure_account_name | default('') }}"
-video_stream_generator_azure_resource_group_name: "{{ media_service_azure_resource_group_name | default('') }}"
-video_stream_generator_azure_token_client_key: "{{ media_service_azure_token_client_key | default('') }}"
-video_stream_generator_azure_token_client_secret: "{{ media_service_azure_token_client_secret | default('') }}"
-video_stream_generator_azure_stream_base_url: "{{ stream_base_url | default('') }}"
 video_stream_generator_consumer_parallelism: 1
 video_stream_generator_parallelism: 1
 video_stream_generator_timer_duration: 1800

kubernetes/helm_charts/datapipeline_jobs/values.j2

@@ -225,27 +225,7 @@ video-stream-generator:
       table = "job_request"
     }
     service.content.basePath="{{ kp_content_service_base_url }}"
-    azure {
-      location = "centralindia"
-      login {
-        endpoint="https://login.microsoftonline.com"
-      }
-      api {
-        endpoint="https://management.azure.com"
-        version = "2018-07-01"
-      }
-      transform {
-        default = "media_transform_default"
-        hls = "media_transform_hls"
-      }
-      stream {
-        base_url="{{ video_stream_generator_azure_stream_base_url }}"
-        endpoint_name = "default"
-        protocol = "Hls"
-        policy_name = "Predefined_ClearStreamingOnly"
-      }
-    }
-
+    
     azure_mediakind{
       project_name="{{ azure_mediakind_project_name }}"
       auth_token="{{ azure_mediakind_auth_token }}"
@@ -263,13 +243,6 @@ video-stream-generator:
         policy_name = "{{azure_mediakind_stream_policy_name}}"
       }
     }
-
-    azure_tenant="{{ video_stream_generator_azure_tenant }}"
-    azure_subscription_id="{{ video_stream_generator_azure_subscription_id }}"
-    azure_account_name="{{ video_stream_generator_azure_account_name }}"
-    azure_resource_group_name="{{ video_stream_generator_azure_resource_group_name }}"
-    azure_token_client_key="{{ video_stream_generator_azure_token_client_key }}"
-    azure_token_client_secret="{{ video_stream_generator_azure_token_client_secret }}"
     ## CSP Name. e.g: aws or azure
     media_service_type="{{ media_service_provider_name }}"
     ## AWS Elemental Media Convert Config
@@ -1129,32 +1102,6 @@ live-video-stream-generator:
       table = "job_request"
     }
     service.content.basePath="{{ kp_content_service_base_url }}"
-    azure {
-      location = "centralindia"
-      login {
-        endpoint="https://login.microsoftonline.com"
-      }
-      api {
-        endpoint="https://management.azure.com"
-        version = "2018-07-01"
-      }
-      transform {
-        default = "media_transform_default"
-        hls = "media_transform_hls"
-      }
-      stream {
-        base_url="{{ video_stream_generator_azure_stream_base_url }}"
-        endpoint_name = "default"
-        protocol = "Hls"
-        policy_name = "Predefined_ClearStreamingOnly"
-      }
-    }
-    azure_tenant="{{ video_stream_generator_azure_tenant }}"
-    azure_subscription_id="{{ video_stream_generator_azure_subscription_id }}"
-    azure_account_name="{{ video_stream_generator_azure_account_name }}"
-    azure_resource_group_name="{{ video_stream_generator_azure_resource_group_name }}"
-    azure_token_client_key="{{ video_stream_generator_azure_token_client_key }}"
-    azure_token_client_secret="{{ video_stream_generator_azure_token_client_secret }}"
     ## CSP Name. e.g: aws or azure
     media_service_type="{{ media_service_provider_name }}"
     ## AWS Elemental Media Convert Config