Merge ~freyes/stsstack-bundles:octavia-hm-ping into stsstack-bundles:master

[Felipe Reyes]

diff --git a/openstack/tools/create_octavia_lb.sh b/openstack/tools/create_octavia_lb.sh
index 1d6a48e..0b878f1 100755
--- a/openstack/tools/create_octavia_lb.sh
+++ b/openstack/tools/create_octavia_lb.sh
@@ -4,6 +4,7 @@ lb=lb1
 member_vm=
 protocol=HTTP
 protocol_port=80
+hm_protocol=
 
 while (( $# > 0 )); do
     case $1 in
@@ -39,6 +40,14 @@ while (( $# > 0 )); do
             protocol_port=$2
             shift
             ;;
+	--healthmonitor-protocol)
+            if (( $# < 2 )); then
+                echo "missing protocol for healthmonitor"
+                exit 1
+            fi
+	    hm_protocol=$2
+	    shift
+	    ;;
         -h|--help)
             cat <<EOF
 Usage:
@@ -61,9 +70,11 @@ EOF
     esac
     shift
 done
-
+if [ -z "$hm_protocol" ]; then
+    hm_protocol=$protocol
+fi
 url_path=
-if [[ ${protocol} == HTTP ]]; then
+if [[ ${hm_protocol} == HTTP ]]; then
     url_path="--url-path /"
 fi
 
@@ -104,7 +115,7 @@ while true; do
 done
 
 HM_ID=$(openstack loadbalancer healthmonitor create \
-    --name ${lb}-healthmonitor --delay 5 --max-retries 4 --timeout 10 --type ${protocol} ${url_path} ${POOL_ID} \
+    --name ${lb}-healthmonitor --delay 5 --max-retries 4 --timeout 10 --type ${hm_protocol} ${url_path} ${POOL_ID} \
     --format value --column id)
 openstack loadbalancer healthmonitor list
 
diff --git a/openstack/tools/install_local_ca.sh b/openstack/tools/install_local_ca.sh
index a72d510..de2e710 100755
--- a/openstack/tools/install_local_ca.sh
+++ b/openstack/tools/install_local_ca.sh
@@ -4,7 +4,7 @@ model_ca_cert_path=${1:-ssl/openstack/results/cacert.pem}
 if ((`juju status --format=json| jq -r '.applications[]| select(."charm-name"=="vault")'| wc -l`)); then
     model_uuid=`juju show-model --format=json| jq -r '.[]."model-uuid"'`
     model_ca_cert_path=`find /tmp -name \*.stsstack-bundles.ssl.$model_uuid 2>/dev/null` || true
-    if [ -z "$model_ca_cert_path" ]; then
+    if [[ -z "$model_ca_cert_path" || "$(cat $model_ca_cert_path)" = "None" ]]; then
         model_ca_cert_path=`mktemp --suffix=.stsstack-bundles.ssl.$model_uuid`
         echo "Fetching CA cert from vault"
         juju run-action --format=json vault/leader get-root-ca --wait | jq -r .[].results.output > $model_ca_cert_path