pcf_blue_green 0.25 → 0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69461c598ded81910be66e929486675fb1f16fdc
-  data.tar.gz: efc57fe11a1bfb448313f670b3f6e40433c4dbcf
+  metadata.gz: ca593b08d6c40ebdbbc54c9833df1f900bc9fe8c
+  data.tar.gz: 1ca466e6d16fc15f2e20425b75ead6353e8afb6b
 SHA512:
-  metadata.gz: 0d31c3fb7a25f18f03d8cb1c0266d8de95eba58a48a0cd45bca499213508dfda7ba5e10f6c87dfddc380ae0e95ce8ad88a3b66caac8df9ea020f17c09a2b46be
-  data.tar.gz: ac44e0d572e5eba97b63c3d91e4230f827d6630ff126f6a3d2420c3097cc604750145b53bcf62a7a08def9cf5af9e3b13c98306142cbc7fdb34f230213c06432
+  metadata.gz: d3d8f4ebfe373bfc1256e6a5f9874a56d60aa9891832d63241bf1982238647a1d2288398d9e4aa5161c0dedd67a8ed2b9ef99c42e047aa1a023d183872403b5d
+  data.tar.gz: f1850390209b34750714cfdab937e1e2a8a1837539b36d027711c1a788db5f3fac080d21229daeb6780cadcdad3da7c61365cd3d953cb6358551a5b1e07bfd64

data/lib/pcf_blue_green/version.rb

@@ -1,3 +1,3 @@
 module PcfBlueGreen
-  VERSION = "0.25"
+  VERSION = "0.26"
 end

data/lib/shared-deploy-functions.sh

@@ -136,13 +136,14 @@ function remap-routes {
     run-cmd cf routes | tail -n +4 | grep ${cf_app} | awk '{print $3" -n "$2}'
     cf routes | tail -n +4 | grep ${cf_app} | awk '{print $3" -n "$2}' |  xargs -n 3 cf map-route ${green}
   else
-    if [ -n "$map_main_route" ]; then
-      run-cmd cf routes | tail -n +4 | awk  '($3==ENVIRON["domain"]) && ($2==ENVIRON["cf_app"]) {print $3" -n " $2 }' |  xargs -n 3 cf map-route ${green}
-    fi
     run-cmd cf routes | tail -n +4 | awk  '($2==ENVIRON["sso_hostname"]) && ($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }'
     cf routes | tail -n +4 | awk  '($2==ENVIRON["sso_hostname"]) && ($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }' |  xargs -n 5 cf map-route ${green}
   fi
 
+  if [ -n "$map_main_route" ]; then
+    run-cmd cf routes | tail -n +4 | awk  '($3==ENVIRON["domain"]) && ($2==ENVIRON["cf_app"]) {print $3" -n " $2 }' |  xargs -n 3 cf map-route ${green}
+  fi
+
   if [ -n "$handle_all_green_paths" ]; then
     run-cmd cf routes | tail -n +4 | awk  '($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }'
     cf routes | tail -n +4 | awk  '($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }' |  xargs -n 5 cf map-route ${green}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pcf_blue_green
 version: !ruby/object:Gem::Version
-  version: '0.25'
+  version: '0.26'
 platform: ruby
 authors:
 - Pawel Bardzinski