use is_minio for endpoint too

koku/koku/configurator.py

@@ -83,6 +83,9 @@ def get_cloudwatch_log_group():
         """Obtain cloudwatch log group."""
         pass
 
+    def get_object_store_endpoint_default(self):
+        pass
+
     @staticmethod
     def get_object_store_endpoint():
         """Obtain object store endpoint."""
@@ -263,6 +266,9 @@ def get_cloudwatch_log_group():
         """Obtain cloudwatch log group."""
         return ENVIRONMENT.get_value("CW_LOG_GROUP", default="platform-dev")
 
+    def get_object_store_endpoint_default(self):
+        return self.get_object_store_endpoint()
+
     @staticmethod
     def get_object_store_endpoint():
         """Obtain object store endpoint."""
@@ -458,6 +464,11 @@ def get_cloudwatch_log_group():
         """Obtain cloudwatch log group."""
         return LoadedConfig.logging.cloudwatch.logGroup
 
+    def get_object_store_endpoint_default(self):
+        if self.is_minio:
+            return self.get_object_store_endpoint()
+        return ENVIRONMENT.get_value("S3_ENDPOINT", default="https://s3.amazonaws.com")
+
     @staticmethod
     def get_object_store_endpoint():
         """Obtain object store endpoint."""

koku/koku/settings.py

@@ -493,7 +493,7 @@
 REQUESTED_ROS_BUCKET = ENVIRONMENT.get_value("REQUESTED_ROS_BUCKET", default="ros-report")
 REQUESTED_SUBS_BUCKET = ENVIRONMENT.get_value("REQUESTED_SUBS_BUCKET", default="subs-report")
 S3_TIMEOUT = ENVIRONMENT.int("S3_CONNECTION_TIMEOUT", default=60)
-S3_ENDPOINT = ENVIRONMENT.get_value("S3_ENDPOINT", default="https://s3.amazonaws.com")
+S3_ENDPOINT = CONFIGURATOR.get_object_store_endpoint_default()
 S3_REGION = ENVIRONMENT.get_value("S3_REGION", default="us-east-1")
 S3_BUCKET_NAME = CONFIGURATOR.get_object_store_bucket(REQUESTED_BUCKET)
 S3_ACCESS_KEY = CONFIGURATOR.get_object_store_access_key_default(REQUESTED_BUCKET)