From 8415485bfd508f747ed745f9889f12bb83aff2d5 Mon Sep 17 00:00:00 2001 From: knaquin Date: Wed, 3 Jul 2019 13:27:48 -0400 Subject: [PATCH 1/3] Baking in context path. --- apps/omar-oms-app/grails-app/conf/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/omar-oms-app/grails-app/conf/application.yml b/apps/omar-oms-app/grails-app/conf/application.yml index cf4928a5..5e880621 100644 --- a/apps/omar-oms-app/grails-app/conf/application.yml +++ b/apps/omar-oms-app/grails-app/conf/application.yml @@ -1,7 +1,7 @@ --- # Set the context path for the application. -#server: -# contextPath: /omar-oms +server: + contextPath: /omar-oms # Define the production database values. environments: From 30ffc18faef079ed373b759e0f8478b221b38230 Mon Sep 17 00:00:00 2001 From: knaquin Date: Mon, 8 Jul 2019 11:57:49 -0400 Subject: [PATCH 2/3] Baking in config. --- apps/omar-oms-app/grails-app/conf/application.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/omar-oms-app/grails-app/conf/application.yml b/apps/omar-oms-app/grails-app/conf/application.yml index 5e880621..ce4e922d 100644 --- a/apps/omar-oms-app/grails-app/conf/application.yml +++ b/apps/omar-oms-app/grails-app/conf/application.yml @@ -1,14 +1,18 @@ --- -# Set the context path for the application. -server: - contextPath: /omar-oms - # Define the production database values. environments: production: dataSource: url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE +omar: + oms: + getRasterFilesUrl: "http://omar-stager-app:8080/omar-stager/dataManager/getRasterFiles" + +# Set the context path for the application. +server: + contextPath: /omar-oms + # Define the http protocols that swagger will use swagger: schemes: From 84d96dbdae0f8f26a073a458f6960e1e308c3718 Mon Sep 17 00:00:00 2001 From: anaga670 Date: Thu, 11 Jul 2019 09:18:11 -0400 Subject: [PATCH 3/3] Updated docs --- docs/install-guide/omar-oms.md | 111 --------------------------------- 1 file changed, 111 deletions(-) diff --git a/docs/install-guide/omar-oms.md b/docs/install-guide/omar-oms.md index 453a44bf..1421a44e 100644 --- a/docs/install-guide/omar-oms.md +++ b/docs/install-guide/omar-oms.md @@ -22,114 +22,3 @@ OMS requires shared access to OSSIM imagery data. This data is assumed to be acc |OSSIM_INSTALL_PREFIX|The directory in which OSSIM is installed (*e.g. /usr*)| |OSSIM_DATA|The location of OSSIM imagery data such as elevation (*e.g. /data*)| |BUCKETS|The S3 to mount for direct image access (*e.g. my-bucket*)| - -### An Example DeploymentConfig - -```yaml -apiVersion: v1 -kind: DeploymentConfig -metadata: - annotations: - openshift.io/generated-by: OpenShiftNewApp - creationTimestamp: null - generation: 1 - labels: - app: omar-openshift - name: omar-oms-app -spec: - replicas: 1 - selector: - app: omar-openshift - deploymentconfig: omar-oms-app - strategy: - activeDeadlineSeconds: 21600 - resources: {} - rollingParams: - intervalSeconds: 1 - maxSurge: 25% - maxUnavailable: 25% - timeoutSeconds: 600 - updatePeriodSeconds: 1 - type: Rolling - template: - metadata: - annotations: - openshift.io/generated-by: OpenShiftNewApp - creationTimestamp: null - labels: - app: omar-openshift - deploymentconfig: omar-oms-app - spec: - containers: - - env: - - name: SPRING_PROFILES_ACTIVE - value: dev - - name: SPRING_CLOUD_CONFIG_LABEL - value: master - - name: OSSIM_PREFS_FILE - value: /usr/share/ossim/ossim-site-preferences - - name: OSSIM_INSTALL_PREFIX - value: /usr - - name: OSSIM_DATA - value: /data - image: 172.30.181.173:5000/o2/omar-oms-app@sha256:cedfb03614eb0ad2386a073793bff517b0e2c47864ed7698e3f7c46884753b7b - imagePullPolicy: Always - livenessProbe: - failureThreshold: 3 - initialDelaySeconds: 60 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 8080 - timeoutSeconds: 1 - name: omar-oms-app - ports: - - containerPort: 8080 - protocol: TCP - readinessProbe: - failureThreshold: 3 - initialDelaySeconds: 30 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 8080 - timeoutSeconds: 1 - resources: {} - securityContext: - capabilities: - add: - - SYS_ADMIN - privileged: true - runAsUser: 1001 - terminationMessagePath: /dev/termination-log - volumeMounts: - - mountPath: /data - name: volume-oms - dnsPolicy: ClusterFirst - restartPolicy: Always - securityContext: {} - terminationGracePeriodSeconds: 30 - volumes: - - name: volume-oms - persistentVolumeClaim: - claimName: ossim-data-dev-pvc - test: false - triggers: - - imageChangeParams: - automatic: true - containerNames: - - omar-oms-app - from: - kind: ImageStreamTag - name: omar-oms-app:latest - namespace: o2 - type: ImageChange - - type: ConfigChange -status: - availableReplicas: 0 - latestVersion: 0 - observedGeneration: 0 - replicas: 0 - unavailableReplicas: 0 - updatedReplicas: 0 -```