Merge ~hopem/stsstack-bundles:add-bundle-trusts into stsstack-bundles:master

[Edward Hope-Morley]

[Jorge Niedbalski (niedbalski)]

LGTM

review: Approve

[Felipe Reyes (freyes)]

LGTM

review: Approve

diff --git a/common/helpers b/common/helpers
index 58057b2..7543a1b 100644
--- a/common/helpers
+++ b/common/helpers
@@ -3,6 +3,8 @@ export CACHED_STDIN=( $@ )
 ((${#CACHED_STDIN[@]})) || CACHED_STDIN=( "" )
 DEFAULT_SERIES=bionic
 
+JUJU_VERSION="`juju --version 2>/dev/null| sed -r 's/^([[:digit:]\.]+).*/\1/g'`"
+
 . $LIB_COMMON/openstack_release_info
 
 _usage () {
diff --git a/kubernetes/pipeline/02configure b/kubernetes/pipeline/02configure
index 24b7caa..83d6f81 100644
--- a/kubernetes/pipeline/02configure
+++ b/kubernetes/pipeline/02configure
@@ -49,6 +49,10 @@ if ! `has_opt '--vault*'`; then
     MOD_OVERLAYS+=( "k8s-easyrsa.yaml" )
 fi
 
+if ! `has_opt --no-trust` && [[ "$JUJU_VERSION" > "2.6.3" ]]; then
+    MOD_OVERLAYS+=( "k8s-openstack-integrator-trust.yaml" )
+fi
+
 while (($# > 0))
 do
     case "$1" in
diff --git a/overlays/k8s-openstack-integrator-trust.yaml b/overlays/k8s-openstack-integrator-trust.yaml
new file mode 100644
index 0000000..6bd06a7
--- /dev/null
+++ b/overlays/k8s-openstack-integrator-trust.yaml
@@ -0,0 +1,3 @@
+applications:
+  openstack-integrator:
+    trust: true