update opsearch CI config and default

openimis · Nov 1, 2024 · 0d6f682 · 0d6f682
1 parent 9114a57
commit 0d6f682
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/ci_assembly.yml b/.github/workflows/ci_assembly.yml
@@ -174,8 +174,7 @@ jobs:
           OPENSEARCH_ADMIN: admin
           OPENSEARCH_PASSWORD: B9wc9VrqX7pY
           OPEN_SEARCH_HTTP_PORT: 9200
-          OPENSEARCH_HOST: localhost
-          OPENSEARCH_HOSTS: "http://localhost:9200"
+          OPENSEARCH_HOSTS: "localhost:9200"
 
       - name: Django tests MSSQL
         working-directory: ./openIMIS
@@ -206,5 +205,4 @@ jobs:
           OPENSEARCH_ADMIN: admin
           OPENSEARCH_PASSWORD: B9wc9VrqX7pY
           OPEN_SEARCH_HTTP_PORT: 9200
-          OPENSEARCH_HOST: localhost
-          OPENSEARCH_HOSTS: "http://localhost:9200"
+          OPENSEARCH_HOSTS: "localhost:9200"
diff --git a/.github/workflows/ci_module.yml b/.github/workflows/ci_module.yml
@@ -393,9 +393,7 @@ jobs:
           MODE: DEV
           OPENSEARCH_ADMIN: admin
           OPENSEARCH_PASSWORD: B9wc9VrqX7pY
-          OPEN_SEARCH_HTTP_PORT: 9200
-          OPENSEARCH_HOST: localhost
-          OPENSEARCH_HOSTS: "http://localhost:9200"
+          OPENSEARCH_HOSTS: "localhost:9200"
   ci_module_psql_test:
     name: Run All Tests (PSQL)
     runs-on: ubuntu-20.04
@@ -518,9 +516,7 @@ jobs:
           MODE: DEV
           OPENSEARCH_ADMIN: admin
           OPENSEARCH_PASSWORD: B9wc9VrqX7pY
-          OPEN_SEARCH_HTTP_PORT: 9200
-          OPENSEARCH_HOST: localhost
-          OPENSEARCH_HOSTS: "http://localhost:9200"
+          OPENSEARCH_HOSTS: "localhost:9200"
       - name: Generate Coverage Report
         if: always()
         working-directory: ./openimis/openIMIS

diff --git a/openIMIS/openIMIS/settings/opensearch.py b/openIMIS/openIMIS/settings/opensearch.py
@@ -2,7 +2,7 @@
 
 
 
-os_hosts = os.environ.get("OPENSEARCH_HOSTS", "http://opensearch:9200")
+os_hosts = os.environ.get("OPENSEARCH_HOSTS", "opensearch:9200")
 
 
 OPEN_SEARCH_HTTP_PORT = os.environ.get("OPEN_SEARCH_HTTP_PORT", "9200")