From e8f372fac928c87854436e585a79660018bcefd3 Mon Sep 17 00:00:00 2001
From: Anders Larsson <anders.larsson@icm.uu.se>
Date: Thu, 16 Mar 2017 11:21:52 +0100
Subject: [PATCH] versioning_on_jupyter_and_galaxy

---
 KubeNow                       | 2 +-
 cloud_portal/shared/deploy.sh | 4 ++++
 playbooks/galaxy.yml          | 5 +++--
 playbooks/jupyter.yml         | 5 +++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/KubeNow b/KubeNow
index c2d9061..6145ca9 160000
--- a/KubeNow
+++ b/KubeNow
@@ -1 +1 @@
-Subproject commit c2d9061e3d83c4222f003f38f2b85fddd95deda8
+Subproject commit 6145ca95953e2dc48e138891190dadd477afd456
diff --git a/cloud_portal/shared/deploy.sh b/cloud_portal/shared/deploy.sh
index 87bf588..0cf214a 100755
--- a/cloud_portal/shared/deploy.sh
+++ b/cloud_portal/shared/deploy.sh
@@ -87,6 +87,8 @@ ansible-playbook -i $ansible_inventory_file \
 # deploy jupyter
 ansible-playbook -i $ansible_inventory_file \
                  -e "domain=$domain" \
+                 -e "jupyter_chart_version=0.1.1" \
+                 -e "jupyter_image_tag=:v387f29b6ca83_cv0.4.7" \
                  -e "jupyter_password=$TF_VAR_jupyter_password" \
                  -e "jupyter_pvc=galaxy-pvc" \
                  -e "jupyter_resource_req_cpu=200m" \
@@ -105,6 +107,8 @@ $PORTAL_APP_REPO_FOLDER'/bin/generate-galaxy-api-key'
 galaxy_api_key=$(cat $PORTAL_DEPLOYMENTS_ROOT'/'$PORTAL_DEPLOYMENT_REFERENCE'/galaxy_api_key')
 ansible-playbook -i $ansible_inventory_file \
                  -e "domain=$domain" \
+                 -e "galaxy_chart_version=0.1.6-phenomenal-alanine" \
+                 -e "galaxy_image_tag=:v16.07-pheno_cv0.1.59" \
                  -e "galaxy_admin_password=$TF_VAR_galaxy_admin_password" \
                  -e "galaxy_admin_email=$TF_VAR_galaxy_admin_email" \
                  -e "galaxy_api_key=$galaxy_api_key" \
diff --git a/playbooks/galaxy.yml b/playbooks/galaxy.yml
index b1f3da3..9e7aadf 100644
--- a/playbooks/galaxy.yml
+++ b/playbooks/galaxy.yml
@@ -11,6 +11,7 @@
     - name: install galaxy
       become: yes
       command: >
-        helm install 
-        --set use_ingress="yes",domain="{{ domain }}",external_ingress_controller="yes",galaxy_admin_email="{{ galaxy_admin_email }}",galaxy_admin_password="{{ galaxy_admin_password }}",galaxy_api_key="{{ galaxy_api_key }}",postgres.db_password="{{ galaxy_admin_password }}",galaxy_pvc="{{ galaxy_pvc }}",postgres.postgres_pvc="{{ postgres_pvc }}",galaxy_create_pvc="false"
+        helm install
+        --version "{{ galaxy_chart_version }}"
+        --set galaxy_image_tag="{{ galaxy_image_tag }}",use_ingress="yes",domain="{{ domain }}",external_ingress_controller="yes",galaxy_admin_email="{{ galaxy_admin_email }}",galaxy_admin_password="{{ galaxy_admin_password }}",galaxy_api_key="{{ galaxy_api_key }}",postgres.db_password="{{ galaxy_admin_password }}",galaxy_pvc="{{ galaxy_pvc }}",postgres.postgres_pvc="{{ postgres_pvc }}",galaxy_create_pvc="false"
         galaxy-helm-repo/galaxy-postgres-chart
diff --git a/playbooks/jupyter.yml b/playbooks/jupyter.yml
index e96f21d..9b8d858 100644
--- a/playbooks/jupyter.yml
+++ b/playbooks/jupyter.yml
@@ -11,6 +11,7 @@
     - name: install jupyter
       become: yes
       command: >
-        helm install 
-        --set passwd_jupyter="{{ jupyter_password }}",use_ingress="yes",domain="{{ domain }}",external_ingress_controller="yes",pvc_exists="yes",jupyter_pvc="{{ jupyter_pvc }}",jupyter_resource_req_cpu="{{ jupyter_resource_req_cpu }}",jupyter_resource_req_memory="{{ jupyter_resource_req_memory }}"
+        helm install
+        --version "{{ jupyter_chart_version }}"
+        --set jupyter_image_tag="{{ jupyter_image_tag }}",passwd_jupyter="{{ jupyter_password }}",use_ingress="yes",domain="{{ domain }}",external_ingress_controller="yes",pvc_exists="yes",jupyter_pvc="{{ jupyter_pvc }}",jupyter_resource_req_cpu="{{ jupyter_resource_req_cpu }}",jupyter_resource_req_memory="{{ jupyter_resource_req_memory }}"
         phenomenal-helm/jupyter