Merge ~nicolasbock/stsstack-bundles:emacs into stsstack-bundles:master

[Nicolas Bock]

[Felipe Reyes (freyes)]

LGTM.

review: Approve

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..a6e4f47
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,5 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((sh-mode
+  (sh-basic-offset . 4)))
diff --git a/openstack/tools/configure_octavia.sh b/openstack/tools/configure_octavia.sh
index f3d0289..8416b16 100755
--- a/openstack/tools/configure_octavia.sh
+++ b/openstack/tools/configure_octavia.sh
@@ -40,4 +40,3 @@ juju config octavia \
     lb-mgmt-controller-cert="$(base64 $dout/controller_cert_bundle.pem)"
 
 juju run-action octavia/leader configure-resources --wait
-
diff --git a/openstack/tools/create_ipv4_octavia.sh b/openstack/tools/create_ipv4_octavia.sh
index c151abd..606fc6c 100755
--- a/openstack/tools/create_ipv4_octavia.sh
+++ b/openstack/tools/create_ipv4_octavia.sh
@@ -1,20 +1,22 @@
 #!/bin/bash
 
+set -u -e -x
+
 # wait for services start
 while true; do
     [[ `juju status keystone --format json | jq -r '.applications.keystone.units."keystone/0"."workload-status".current'` = active ]] \
-    && break
+        && break
     if [[ `juju status keystone --format json | jq -r '.applications.keystone.units."keystone/0"."workload-status".current'` = error ]]
     then
-      echo "ERROR: Octavia deployment failed" 
-      break
+        echo "ERROR: Octavia deployment failed"
+        break
     fi
 done
 
 echo INFO: create temp novarc.services and extract octavia password
 touch /tmp/novarc.services
 
-cat << EOF > /tmp/novarc.services 
+cat << EOF > /tmp/novarc.services
 OS_PROJECT_DOMAIN_NAME=service_domain
 OS_USERNAME=octavia
 OS_PROJECT_NAME=services
@@ -30,8 +32,8 @@ openstack router create lb-mgmt --tag charm-octavia
 openstack router add subnet lb-mgmt lb-mgmt-subnet
 
 echo INFO: add security rules
-openstack security group create lb-mgmt-sec-grp --tag charm-octavia 
-openstack security group create lb-health-mgr-sec-grp --tag charm-octavia-health 
-openstack security group rule create lb-mgmt-sec-grp --protocol icmp 
-openstack security group rule create lb-mgmt-sec-grp --protocol tcp --protocol tcp --dst-port 22 
+openstack security group create lb-mgmt-sec-grp --tag charm-octavia
+openstack security group create lb-health-mgr-sec-grp --tag charm-octavia-health
+openstack security group rule create lb-mgmt-sec-grp --protocol icmp
+openstack security group rule create lb-mgmt-sec-grp --protocol tcp --protocol tcp --dst-port 22
 openstack security group rule create lb-mgmt-sec-grp --protocol tcp --dst-port 9443
diff --git a/openstack/tools/float_all.sh b/openstack/tools/float_all.sh
index ac32695..e40ef70 100755
--- a/openstack/tools/float_all.sh
+++ b/openstack/tools/float_all.sh
@@ -5,8 +5,8 @@
 echo " + Floating all instances."
 
 function get_ip_f() {
-  # Get first unallocated floating IP
-  openstack floating ip list | awk '/None/ { print $4; exit }'
+    # Get first unallocated floating IP
+    openstack floating ip list | awk '/None/ { print $4; exit }'
 }
 
 fip_count=$(openstack floating ip list | awk '/None/ { print $4 }' | wc -l)
@@ -14,26 +14,25 @@ instances=$(openstack server list | grep ACTIVE | grep -v '\,' | awk '{ print $2
 inst_count=$(echo $instances | wc -w)
 
 if [[ -z "$instances" ]]; then
-  set +x
-  echo " . It appears that no instance needs a floating IP."
-  exit 0
+    set +x
+    echo " . It appears that no instance needs a floating IP."
+    exit 0
 fi
 
 # Create floating IPs if necessary.
 if (( $fip_count >= $inst_count)); then
-  echo " . Already enough floating IPs."
+    echo " . Already enough floating IPs."
 else
-  fip_diff=$(( $inst_count - $fip_count ))
-  echo " + Creating $fip_diff more floating IPs."
-  for ((m=1; m<=$fip_diff; m++)); do
-    openstack floating ip create ext_net
-  done
+    fip_diff=$(( $inst_count - $fip_count ))
+    echo " + Creating $fip_diff more floating IPs."
+    for ((m=1; m<=$fip_diff; m++)); do
+        openstack floating ip create ext_net
+    done
 fi
 
 # Allocate floating IPs to instances.
 for instance in $instances; do
-  ip_f=$(get_ip_f)
-  echo " + Associating floating IP $ip_f to instance $instance."
-  openstack server add floating ip $instance $ip_f
+    ip_f=$(get_ip_f)
+    echo " + Associating floating IP $ip_f to instance $instance."
+    openstack server add floating ip $instance $ip_f
 done
-
diff --git a/openstack/tools/instance_launch.sh b/openstack/tools/instance_launch.sh
index 0ee90bd..2b5016b 100755
--- a/openstack/tools/instance_launch.sh
+++ b/openstack/tools/instance_launch.sh
@@ -42,5 +42,4 @@ fi
 server_name="${image_name}-$(date +'%H%M%S')"
 openstack server create --wait --image $image_name --flavor $flavor --key-name testkey --nic net-id=${net_id} --min $instance_qty --max $instance_qty $server_name
 
-# Hint:  use ssh -i ~/testkey.pem ubuntu@<ip> to access new instances (may also need a floating IP).
-
+echo 'Hint: use ssh -i ~/testkey.pem ubuntu@<ip> to access new instances (may also need a floating IP, see ./tools/float_all.sh).'
diff --git a/openstack/tools/upload_octavia_amphora_image.sh b/openstack/tools/upload_octavia_amphora_image.sh
index 21d8e7f..f72fa06 100755
--- a/openstack/tools/upload_octavia_amphora_image.sh
+++ b/openstack/tools/upload_octavia_amphora_image.sh
@@ -7,17 +7,17 @@ declare release=
 declare image_format=
 
 while (( $# > 0 )); do
-  case $1 in
-    --release|-r)
-      release=$2
-      shift
-      ;;
-    --image-format|-f)
-      image_format=$2
-      shift
-      ;;
-    --help|-h)
-      cat <<EOF
+    case $1 in
+        --release|-r)
+            release=$2
+            shift
+            ;;
+        --image-format|-f)
+            image_format=$2
+            shift
+            ;;
+        --help|-h)
+            cat <<EOF
 Usage:
 
 ./tools/upload_octavia_amphora_image.sh --release RELEASE [--image-format FORMAT]
@@ -29,19 +29,19 @@ Options:
 --image-format | -f     The image format {'qcow2', 'raw'}. The default
                         is qcow2.
 EOF
-      exit
-      ;;
-    *)
-      echo "Unknown command line option $1"
-      exit 1
-      ;;
-  esac
-  shift
+            exit
+            ;;
+        *)
+            echo "Unknown command line option $1"
+            exit 1
+            ;;
+    esac
+    shift
 done
 
 if [[ -z ${release} ]]; then
-  echo "Missing release. Please specify one with --release command line option"
-  exit 1
+    echo "Missing release. Please specify one with --release command line option"
+    exit 1
 fi
 
 set -x
@@ -60,7 +60,7 @@ upload_image swift octavia-amphora $img $image_format
 
 image_name=octavia-amphora
 if [[ $image_format == raw ]]; then
-  image_name=${image_name}-raw
+    image_name=${image_name}-raw
 fi
 
 openstack image set --tag octavia-amphora ${image_name}