Skip to content

Commit

Permalink
Add the orchestrator to the external db template
Browse files Browse the repository at this point in the history
Missed this in ManageIQ#207
  • Loading branch information
carbonin committed Feb 19, 2018
1 parent 41a7caf commit 4b678b4
Showing 1 changed file with 10 additions and 35 deletions.
45 changes: 10 additions & 35 deletions templates/miq-template-ext-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,6 @@ objects:
database-url: postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_SERVICE_NAME}/${DATABASE_NAME}?encoding=utf8&pool=5&wait_timeout=5
v2-key: "${V2_KEY}"
artemis-password: "${ARTEMIS_PASSWORD}"
- apiVersion: v1
kind: Service
metadata:
annotations:
description: Exposes and load balances ManageIQ pods
service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"},{"name":"${MEMCACHED_SERVICE_NAME}","namespace":"","kind":"Service"}]'
name: "${NAME}"
spec:
clusterIP: None
ports:
- name: http
port: 80
protocol: TCP
targetPort: 80
selector:
name: "${NAME}"
- apiVersion: v1
kind: Route
metadata:
Expand All @@ -68,11 +52,10 @@ objects:
- apiVersion: v1
kind: DeploymentConfig
metadata:
name: "${NAME}"
name: "${NAME}-orchestrator"
annotations:
description: Defines how to deploy the ManageIQ appliance
spec:
serviceName: "${NAME}"
replicas: "${APPLICATION_REPLICA_COUNT}"
template:
metadata:
Expand All @@ -81,35 +64,27 @@ objects:
name: "${NAME}"
spec:
containers:
- name: manageiq
image: "${APPLICATION_IMG_NAME}:${FRONTEND_APPLICATION_IMG_TAG}"
- name: manageiq-orchestrator
image: "${APPLICATION_IMG_NAME}:${ORCHESTRATOR_APPLICATION_IMG_TAG}"
livenessProbe:
exec:
command:
- pidof
- MIQ Server
initialDelaySeconds: 480
timeoutSeconds: 3
readinessProbe:
tcpSocket:
port: 80
initialDelaySeconds: 200
timeoutSeconds: 3
ports:
- containerPort: 80
protocol: TCP
env:
- name: ALLOW_INSECURE_SESSION
value: 'true'
- name: GUID
value: "${GUID}"
- name: APPLICATION_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
name: "${NAME}-secrets"
key: admin-password
- name: APPLICATION_INIT_DELAY
value: "${APPLICATION_INIT_DELAY}"
- name: GUID
value: "${GUID}"
- name: DATABASE_REGION
value: "${DATABASE_REGION}"
- name: DATABASE_URL
Expand Down Expand Up @@ -666,11 +641,11 @@ parameters:
- name: APPLICATION_IMG_NAME
displayName: Application Image Name
description: This is the Application image name requested to deploy.
value: docker.io/manageiq/manageiq-pods
- name: FRONTEND_APPLICATION_IMG_TAG
displayName: Front end Application Image Tag
description: This is the ManageIQ Frontend Application image tag/version requested to deploy.
value: frontend-latest
value: docker.io/manageiq/manageiq-orchestrator
- name: ORCHESTRATOR_APPLICATION_IMG_TAG
displayName: Orchestrator Image Tag
description: This is the ManageIQ orchestrator image tag/version requested to deploy.
value: latest
- name: ARTEMIS_IMG_NAME
displayName: Artemis Image Name
description: This is the Artemis image name requested to deploy.
Expand Down

0 comments on commit 4b678b4

Please sign in to comment.