Merge pull request #249 from simaishi/update_gaprindashvili

[GAPRINDASHVILI] Updates for Gaprindashvili branch
ManageIQ · Nov 17, 2017 · ca223dd · ca223dd
2 parents 9478493 + 35a67ac
commit ca223dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/images/miq-app/Dockerfile b/images/miq-app/Dockerfile
@@ -26,8 +26,8 @@ LABEL name="manageiq" \
       io.openshift.tags="ManageIQ,miq,manageiq"
 
 # Fetch MIQ repo for http-parser
-RUN curl -sSLko /etc/yum.repos.d/manageiq-ManageIQ-Fine-epel-7.repo \
-      https://copr.fedorainfracloud.org/coprs/manageiq/ManageIQ-Fine/repo/epel-7/manageiq-ManageIQ-Fine-epel-7.repo
+RUN curl -sSLko /etc/yum.repos.d/manageiq-ManageIQ-Gaprindashvili-epel-7.repo \
+      https://copr.fedorainfracloud.org/coprs/manageiq/ManageIQ-Gaprindashvili/repo/epel-7/manageiq-ManageIQ-Gaprindashvili-epel-7.repo
 
 ## Install EPEL repo, yum necessary packages for the build without docs, clean all caches
 RUN yum -y install centos-release-scl-rh && \

diff --git a/templates/miq-template-ext-db.yaml b/templates/miq-template-ext-db.yaml
@@ -860,11 +860,11 @@ parameters:
 - 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: frontend-latest-gaprindashvili
 - name: BACKEND_APPLICATION_IMG_TAG
   displayName: Back end Application Image Tag
   description: This is the ManageIQ Backend Application image tag/version requested to deploy.
-  value: backend-latest
+  value: backend-latest-gaprindashvili
 - name: ANSIBLE_IMG_NAME
   displayName: Ansible Image Name
   description: This is the Ansible image name requested to deploy.

diff --git a/templates/miq-template.yaml b/templates/miq-template.yaml
@@ -1032,11 +1032,11 @@ parameters:
 - 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: frontend-latest-gaprindashvili
 - name: BACKEND_APPLICATION_IMG_TAG
   displayName: Back end Application Image Tag
   description: This is the ManageIQ Backend Application image tag/version requested to deploy.
-  value: backend-latest
+  value: backend-latest-gaprindashvili
 - name: ANSIBLE_IMG_NAME
   displayName: Ansible Image Name
   description: This is the Ansible image name requested to deploy.