@@ -256,6 +256,14 @@ copy_connector()
256256    ST=` date +%s` 
257257    print_msg " Installing Connector into Container" 
258258
259+     printf  " \n\t\t\tCheck Connector Exists - " 
260+     if  [ -d  $CONNECTOR_DIR /OID-12.2.1*  ]
261+     then 
262+           echo  " Success" 
263+     else 
264+           echo  "  Connector Bundle not found.  Please download and stage before continuing" 
265+           exit  1
266+     fi 
259267
260268    kubectl exec  -ti $OIG_DOMAIN_NAME -oim-server1 -n $OIGNS  -- mkdir -p /u01/oracle/user_projects/domains/ConnectorDefaultDirectory
261269    if  !  [ " $? " =  " 0" 
@@ -264,6 +272,7 @@ copy_connector()
264272       exit  1
265273    fi 
266274
275+     printf  " \n\t\t\tCopy Connector to container - " 
267276    kubectl cp $CONNECTOR_DIR /OID-12.2*   $OIGNS /$OIG_DOMAIN_NAME -adminserver:/u01/oracle/user_projects/domains/ConnectorDefaultDirectory
268277    print_status $? 
269278
@@ -542,8 +551,8 @@ generate_parameter_files()
542551          run_command_k8 $OIGNS  $OIG_DOMAIN_NAME  " chmod 750 /u01/oracle/idm/server/ssointg/bin/OIGOAMIntegration.sh" 
543552          run_command_k8 $OIGNS  $OIG_DOMAIN_NAME  " chmod 750 /u01/oracle/idm/server/ssointg/bin/_OIGOAMIntegration.sh" 
544553          run_command_k8 $OIGNS  $OIG_DOMAIN_NAME  " chmod 750 $PV_MOUNT /workdir/get_passphrase.sh" 
545-           run_command_k8 $OIGNS  $OIG_DOMAIN_NAME  " $PV_MOUNT /workdir/get_passphrase.sh" 
546-           print_status $? 
554+           run_command_k8 $OIGNS  $OIG_DOMAIN_NAME  " $PV_MOUNT /workdir/get_passphrase.sh"   >>   $LOGDIR /get_passphrase.log  2>&1 
555+           print_status $?   $LOGDIR /get_passphrase.log 
547556
548557          printf  " \t\t\tEdit Integration File - " 
549558     fi 
@@ -856,7 +865,7 @@ create_oig_ohs_config()
856865   then 
857866        mkdir -p $OHS_PATH /$OHS_HOST1 
858867   fi 
859-    if  !  [ -d  $OHS_PATH /OHS/ $OHS_HOST2  ]
868+    if  !  [ -d  $OHS_PATH /$OHS_HOST2  ]
860869   then 
861870        mkdir -p $OHS_PATH /$OHS_HOST2 
862871   fi 
@@ -909,54 +918,47 @@ create_oig_ohs_config()
909918
910919   fi 
911920
912-    if  [ !  " $OHS_HOST2 " =  " " 
921+    if  [ !  " $OHS_HOST2 " =  " "   
913922   then 
914-       cp $TEMPLATE_DIR /igdadmin_vh.conf $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
915-       cp $TEMPLATE_DIR /prov_vh.conf $OHS_PATH /$OHS_HOST2 /prov_vh.conf
916-       cp $TEMPLATE_DIR /igdinternal_vh.conf $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
917-       update_variable " <OHS_HOST>" $OHS_HOST2  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
918-       update_variable " <OHS_PORT>" $OHS_PORT  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
919-       update_variable " <OIG_ADMIN_LBR_HOST>" $OIG_ADMIN_LBR_HOST  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
920-       update_variable " <OIG_ADMIN_LBR_PORT>" $OIG_ADMIN_LBR_PORT  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
921-       update_variable " <K8_WORKER_HOST1>" $K8_WORKER_HOST1  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
922-       update_variable " <K8_WORKER_HOST2>" $K8_WORKER_HOST2  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
923- 
924-       update_variable " <OHS_HOST>" $OHS_HOST2  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
925-       update_variable " <OHS_PORT>" $OHS_PORT  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
926-       update_variable " <OIG_LBR_PROTOCOL>" $OIG_LBR_PROTOCOL  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
927-       update_variable " <OIG_LBR_HOST>" $OIG_LBR_HOST  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
928-       update_variable " <OIG_LBR_PORT>" $OIG_LBR_PORT  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
929-       update_variable " <K8_WORKER_HOST1>" $K8_WORKER_HOST1  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
930-       update_variable " <K8_WORKER_HOST2>" $K8_WORKER_HOST2  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
931- 
932-       update_variable " <OHS_HOST>" $OHS_HOST2  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
933-       update_variable " <OHS_PORT>" $OHS_PORT  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
934-       update_variable " <OIG_LBR_INT_PROTOCOL>" $OIG_LBR_INT_PROTOCOL  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
935-       update_variable " <OIG_LBR_INT_HOST>" $OIG_LBR_INT_HOST  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
936-       update_variable " <OIG_LBR_INT_PORT>" $OIG_LBR_INT_PORT  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
937-       update_variable " <K8_WORKER_HOST1>" $K8_WORKER_HOST1  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
938-       update_variable " <K8_WORKER_HOST2>" $K8_WORKER_HOST2  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
939- 
940-       if  [ " $USE_INGRESS " =  " true" 
941-       then 
942-          update_variable " <OIG_OIM_PORT_K8>" $INGRESS_HTTP_PORT  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
943-          update_variable " <OIG_OIM_PORT_K8>" $INGRESS_HTTP_PORT  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
944-          update_variable " <OIG_SOA_PORT_K8>" $INGRESS_HTTP_PORT  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
945-          update_variable " <OIG_OIM_PORT_K8>" $INGRESS_HTTP_PORT  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
946-          update_variable " <OIG_SOA_PORT_K8>" $INGRESS_HTTP_PORT  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
947-          update_variable " <OIG_ADMIN_K8>" $INGRESS_HTTP_PORT  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
948-       else 
949-          update_variable " <OIG_OIM_PORT_K8>" $OIG_OIM_PORT_K8  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
950-          update_variable " <OIG_OIM_PORT_K8>" $OIG_OIM_PORT_K8  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
951-          update_variable " <OIG_SOA_PORT_K8>" $OIG_SOA_PORT_K8  $OHS_PATH /$OHS_HOST2 /prov_vh.conf
952-          update_variable " <OIG_OIM_PORT_K8>" $OIG_OIM_PORT_K8  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
953-          update_variable " <OIG_SOA_PORT_K8>" $OIG_SOA_PORT_K8  $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
954-          update_variable " <OIG_ADMIN_K8>" $OIG_ADMIN_K8  $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
955-       fi 
923+       cp  $OHS_PATH /$OHS_HOST1 /igdadmin_vh.conf $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
924+       cp $OHS_PATH /$OHS_HOST1 /prov_vh.conf $OHS_PATH /$OHS_HOST2 /prov_vh.conf
925+       cp $OHS_PATH /$OHS_HOST1 /igdinternal_vh.conf $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
926+       sed -i " s/$OHS_HOST1 /$OHS_HOST2 /" $OHS_PATH /$OHS_HOST2 /igdadmin_vh.conf
927+       sed -i " s/$OHS_HOST1 /$OHS_HOST2 /" $OHS_PATH /$OHS_HOST2 /prov_vh.conf
928+       sed -i " s/$OHS_HOST1 /$OHS_HOST2 /" $OHS_PATH /$OHS_HOST2 /igdinternal_vh.conf
956929   fi 
957930
958931   print_status $? 
959932
960933   ET=` date +%s` 
961934   print_time STEP " Creating OHS config" $ST  $ET  >>  $LOGDIR /timings.log
962935}
936+ 
937+ #  Create logstash configmap
938+ # 
939+ create_logstash_cm ()
940+ {
941+    ST=` date +%s` 
942+    print_msg " Creating logstash Config Map" 
943+    cp $TEMPLATE_DIR /logstash_cm.yaml $WORKDIR 
944+ 
945+    update_variable " <OIGNS>" $OIGNS  $WORKDIR /logstash_cm.yaml
946+    update_variable " <ELK_HOST>" $ELK_HOST  $WORKDIR /logstash_cm.yaml
947+    update_variable " <ELK_USER_PWD>" $ELK_USER_PWD  $WORKDIR /logstash_cm.yaml
948+ 
949+    kubectl create -f $WORKDIR /logstash_cm.yaml > $LOGDIR /logstash_cm.log 2>&1 
950+    if  [ $?  =  0 ]
951+    then 
952+         echo  " Success" 
953+    else 
954+        grep -q " AlreadyExists" $LOGDIR /logstash_cm.log
955+        if  [ $?  =  0 ]
956+        then 
957+           echo  " Already Exists" 
958+        else 
959+           print_status 1 $LOGDIR /logstash_cm.log
960+        fi 
961+    fi 
962+    ET=` date +%s` 
963+    print_time STEP " Create Logstash Config Map" $ST  $ET  >>  $LOGDIR /timings.log
964+ }
0 commit comments