Merge pull request #50 from marklogic/feature/CLD-646

Add App-Services App-server creation

Author: rwinieski

charts/templates/statefulset.yaml

@@ -51,18 +51,21 @@ spec:
               exit 0
             fi
             log "Info: [initContainer] Group $MARKLOGIC_GROUP does not exist, configuring group $MARKLOGIC_GROUP on the MarkLogic cluster."
-            for i in $(seq 1 5); do
-              res_code=`curl --anyauth --user ${MARKLOGIC_ADMIN_USERNAME}:${MARKLOGIC_ADMIN_PASSWORD} -m 20 -s -w '%{http_code}' -X POST -d "${GROUP_CFG}" -H "Content-type: application/json" http://${MARKLOGIC_BOOTSTRAP_HOST}:8002/manage/v2/groups`
-              if [[ ${res_code} -eq 201 ]]; then
-                log "Info: [initContainer] Successfully configured group $MARKLOGIC_GROUP on the MarkLogic cluster."
-                break
-              else
-                log "Info: [initContainer] Configure group $MARKLOGIC_GROUP retry attempt $i "
-                log "Info: [initContainer] Expected response code 202, got $res_code"
-                sleep 10s
-              fi
-              [ $i -eq 5 ] && exit 1
-            done
+            res_code=`curl --retry 5 --retry-all-errors --retry-max-time 60 --anyauth --user ${MARKLOGIC_ADMIN_USERNAME}:${MARKLOGIC_ADMIN_PASSWORD} -m 20 -s -w '%{http_code}' -X POST -d "${GROUP_CFG}" -H "Content-type: application/json" http://${MARKLOGIC_BOOTSTRAP_HOST}:8002/manage/v2/groups`
+            if [[ ${res_code} -eq 201 ]]; then
+              log "Info: [initContainer] Successfully configured group $MARKLOGIC_GROUP on the MarkLogic cluster."
+            else
+              log "Info: [initContainer] Expected response code 201, got $res_code"
+              exit 1
+            fi
+            log "Info: [initContainer] Group $MARKLOGIC_GROUP has been created, configuring App-server App-Services in group $MARKLOGIC_GROUP on the MarkLogic cluster."
+            res_code=`curl --retry 5 --retry-all-errors --retry-max-time 60 --anyauth --user ${MARKLOGIC_ADMIN_USERNAME}:${MARKLOGIC_ADMIN_PASSWORD} -m 20 -s -w '%{http_code}' -X POST -d '{"server-name":"App-Services", "root":"/", "port":8000,"modules-database":"Modules", "content-database":"Documents", "error-handler":"/MarkLogic/rest-api/8000-error-handler.xqy", "url-rewriter":"/MarkLogic/rest-api/8000-rewriter.xml"}' -H "Content-type: application/json" "http://${MARKLOGIC_BOOTSTRAP_HOST}:8002/manage/v2/servers?group-id=${MARKLOGIC_GROUP}&server-type=http"`
+            if [[ ${res_code} -eq 201 ]]; then
+              log "Info: [initContainer] Successfully configured App-server App-Services into group $MARKLOGIC_GROUP on the MarkLogic cluster."
+            else
+              log "Info: [initContainer] Expected response code 201, got $res_code"
+              exit 1
+            fi                      
         env: 
         - name: MARKLOGIC_GROUP
           value: {{ .Values.group.name }}