From 9cd500e27186de2141bf6b8f40fdc78ee9d57df0 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Tue, 15 Nov 2022 11:59:47 +0800 Subject: [PATCH] Revert "Fix hostname issue" This reverts commit c6d1010ba670d6b01876ee3d46c8364ccc530c4a. Signed-off-by: Bin Yang Change-Id: Iea0163c1360fc4bd065fb3786b96f1b9cb664f08 --- charts/resources/scripts/init/o2api_start.sh | 10 +++++----- charts/templates/deployment.yaml | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/resources/scripts/init/o2api_start.sh b/charts/resources/scripts/init/o2api_start.sh index 0ef9760..6c7ebbf 100644 --- a/charts/resources/scripts/init/o2api_start.sh +++ b/charts/resources/scripts/init/o2api_start.sh @@ -24,11 +24,11 @@ # pip install -e /root/o2 # pip install -e /src -# cat <>/etc/hosts -# 127.0.0.1 api -# 127.0.0.1 postgres -# 127.0.0.1 redis -# EOF +cat <>/etc/hosts +127.0.0.1 api +127.0.0.1 postgres +127.0.0.1 redis +EOF flask run --host=0.0.0.0 --port=80 --cert /configs/server.crt --key /configs/server.key diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml index 7d110cb..98dc174 100644 --- a/charts/templates/deployment.yaml +++ b/charts/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: command: ["/bin/bash", "/opt/o2pubsub_start.sh"] env: - name: DB_HOST - value: localhost + value: postgres - name: DB_PASSWORD value: o2ims123 - name: LOGGING_CONFIG_LEVEL @@ -82,7 +82,7 @@ spec: - name: PYTHONDONTWRITEBYTECODE value: "1" - name: REDIS_HOST - value: localhost + value: redis - name: K8S_KUBECONFIG value: {{ .Values.ocloud.K8S_KUBECONFIG }} volumeMounts: @@ -102,7 +102,7 @@ spec: - name: API_HOST_EXTERNAL_FLOATING value: {{ .Values.ocloud.API_HOST_EXTERNAL_FLOATING }} - name: DB_HOST - value: localhost + value: postgres - name: DB_PASSWORD value: o2ims123 - name: LOGGING_CONFIG_LEVEL @@ -116,7 +116,7 @@ spec: - name: PYTHONDONTWRITEBYTECODE value: "1" - name: REDIS_HOST - value: localhost + value: redis volumeMounts: - name: scripts mountPath: /opt @@ -132,7 +132,7 @@ spec: - name: API_HOST_EXTERNAL_FLOATING value: {{ .Values.ocloud.API_HOST_EXTERNAL_FLOATING }} - name: DB_HOST - value: localhost + value: postgres - name: DB_PASSWORD value: o2ims123 - name: FLASK_APP @@ -149,7 +149,7 @@ spec: - name: PYTHONUNBUFFERED value: "1" - name: REDIS_HOST - value: localhost + value: redis - name: HELM_USER_PASSWD value: {{ .Values.ocloud.HELM_USER_PASSWD }} command: ["/bin/bash", "/opt/o2api_start.sh"] -- 2.16.6