Merge ~hemanth-n/stsstack-bundles:1888100 into stsstack-bundles:master

[Hemanth Nakkina]

Update parameter __OCTAVIA_RETROFIT_UCA__ even when release is not specified

[Edward Hope-Morley (hopem)]

lgtm

review: Approve

diff --git a/common/helpers b/common/helpers
index 931b423..e71c27c 100644
--- a/common/helpers
+++ b/common/helpers
@@ -347,7 +347,15 @@ get_uca_release ()
     # lts s+r means no uca
     ltsmatch "$s" "$r" && return
     # else its uca
-    echo $release
+    echo $r
+}
+
+get_ost_release ()
+{
+    local r=`get_release`
+    local s=`get_series`
+    [ -n "$r" ] || r=${lts[$s]:-${nonlts[$s]:-""}}
+    echo "$r"
 }
 
 cache ()
diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
index e41319b..0ddbe2d 100644
--- a/openstack/pipeline/02configure
+++ b/openstack/pipeline/02configure
@@ -301,7 +301,7 @@ do
             if ! has_opt --no-octavia-diskimage-retrofit; then
                 # By default we let retrofit use images uploaded by the post-deploy configure script.
                 MOD_OVERLAYS+=( "octavia-diskimage-retrofit.yaml" )
-                MOD_PARAMS[__OCTAVIA_RETROFIT_UCA__]=`get_uca_release`
+                MOD_PARAMS[__OCTAVIA_RETROFIT_UCA__]=`get_ost_release`
                 if ! has_opt --octavia-diskimage-retrofit-glance-simplestreams; then
                    MOD_OVERLAYS+=( "octavia-diskimage-retrofit-glance.yaml" )
                 fi