#OB-553 fix: Deployment issue fixes for OCI

ansible/roles/data-products-deploy/templates/common.conf.j2

@@ -8,6 +8,10 @@ service.search.path="{{ service.search.path }}"
 spark.cassandra.connection.host="{{groups['dp-cassandra'][0]}}"
 cassandra.keyspace_prefix="{{ cassandra_keyspace_prefix }}"
 cassandra.hierarchy_store_prefix="{{ cassandra_hierarchy_store_prefix }}"
+
+cloud_storage_type="{{ cloud_service_provider }}"
+cloud_storage_endpoint_with_protocol="{{ cloud_private_storage_endpoint }}"
+
 storage.key.config="{{ dp_storage_key_config }}"
 storage.secret.config="{{ dp_storage_secret_config }}"
 reports.storage.key.config="{{ dp_reports_storage_key_config }}"

kubernetes/helm_charts/secor/config/secor.common.properties

@@ -56,7 +56,7 @@ aws.endpoint=
 
 # Toggle the AWS S3 client between virtual host style access and path style
 # access. See http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
-aws.client.pathstyleaccess=
+#aws.client.pathstyleaccess=
 
 ###########################
 # START AWS S3 ENCRYPTION #
@@ -358,7 +358,7 @@ secor.max.message.size.bytes=100000
 # Class that will manage uploads. Default is to use the hadoop
 # interface to S3.
 # secor.upload.manager.class=com.pinterest.secor.uploader.AzureUploadManager
-secor.upload.manager.class=
+#secor.upload.manager.class=com.pinterest.secor.uploader.S3UploadManager
 
 #Set below property to your timezone, and the events will be parsed and converted to the timezone specified
 secor.message.timezone=UTC

kubernetes/helm_charts/secor/values.j2

@@ -2,10 +2,10 @@ azure_account: "{{ cloud_private_storage_accountname }}"
 azure_secret: "{{ cloud_private_storage_secret }}"
 azure_container_name: "telemetry-data-store"
 
-s3_access_key: "{{s3_storage_key}}"
-s3_secret_id: "{{s3_storage_secret}}"
-s3_region: "{{oci_region}}"
-s3_endpoint: "{{s3_storage_endpoint}}"
+s3_access_key: "{{cloud_private_storage_accountname}}"
+s3_secret_id: "{{cloud_private_storage_secret}}"
+s3_region: "{{cloud_private_storage_region}}"
+s3_endpoint: "{{cloud_private_storage_endpoint}}"
 s3_path_style_access: "{{s3_path_style_access}}"
 s3_bucket_name: "telemetry-data-store"