Merge pull request #64 from PaaS-TA/working-logging-service

[service-deployment] service-deployment 5.1.17
PaaS-TA · Dec 14, 2022 · 4f2c876 · 4f2c876
2 parents 314a955 + f4870f6
commit 4f2c876
Show file tree

Hide file tree

Showing 21 changed files with 259 additions and 350 deletions.
diff --git a/gateway-service/vars.yml b/gateway-service/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                         # stemcell os
-stemcell_version: "1.107"                                           # stemcell version
+stemcell_version: "1.122"                                           # stemcell version
 
 # VM_TYPE
 vm_type_default: "medium"                                            # vm type default

diff --git a/glusterfs/vars.yml b/glusterfs/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.107"                                       # stemcell version
+stemcell_version: "1.122"                                       # stemcell version
 
 
 # NETWORK

diff --git a/lifecycle-service/vars.yml b/lifecycle-service/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                                         # stemcell os
-stemcell_version: "1.107"                                                           # stemcell version
+stemcell_version: "1.122"                                                           # stemcell version
 
 # VM_TYPE
 vm_type_default: "medium"                                                            # vm type default

diff --git a/logging-service/deploy.sh b/logging-service/deploy.sh
@@ -1,12 +1,39 @@
 #!/bin/bash
 
 # VARIABLES
-COMMON_VARS_PATH="<COMMON_VARS_FILE_PATH>"       # common_vars.yml File Path (e.g. ../../common/common_vars.yml)
-CURRENT_IAAS="${CURRENT_IAAS}"					 # IaaS Information (PaaS-TA에서 제공되는 create-bosh-login.sh 미 사용시 aws/azure/gcp/openstack/vsphere 입력)
-BOSH_ENVIRONMENT="${BOSH_ENVIRONMENT}"			 # bosh director alias name (PaaS-TA에서 제공되는 create-bosh-login.sh 미 사용시 bosh envs에서 이름을 확인하여 입력)
-
-# DEPLOY
-bosh -e ${BOSH_ENVIRONMENT} -n -d logging-service deploy --no-redact logging-service.yml \
-    -o operations/${CURRENT_IAAS}-network.yml \
-    -l ${COMMON_VARS_PATH} \
-    -l vars.yml
+COMMON_VARS_PATH="<COMMON_VARS_FILE_PATH>"             # common_vars.yml File Path (e.g. ../../common/common_vars.yml)
+BOSH_ENVIRONMENT="${BOSH_ENVIRONMENT}"                   # bosh director alias name (PaaS-TA에서 제공되는 create-bosh-login.sh 미 사용시 bosh envs에서 이름을 확인하여 입력)
+
+
+# Portal 설치 타입 및 프로토콜 종류에 따라 옵션 파일 사용 여부를 분기한다.
+PORTAL_TYPE=`grep portal_deploy_type vars.yml | cut -d "#" -f1`
+FLUENTD_TRANSPORT=`grep fluentd_transport vars.yml`
+
+
+if [[ "${PORTAL_TYPE}" =~ "app" ]]; then
+  if [[ "${FLUENTD_TRANSPORT}" =~ "tcp" ]]; then
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -o operations/portal-app-type.yml \
+          -o operations/use-protocol-tcp.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  else
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -o operations/portal-app-type.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  fi
+elif [[ "${PORTAL_TYPE}" =~ "vm" ]]; then
+  if [[ "${FLUENTD_TRANSPORT}" =~ "tcp" ]]; then
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -o operations/use-protocol-tcp.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  else
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  fi
+else
+  echo "Logging Service can't install. Please check 'portal_deploy_type'."
+fi