From 6c01f5930b38676fdbe88bfde6ed07d41a421063 Mon Sep 17 00:00:00 2001
From: Manuel Montecelo <mmontecelo@sipwise.com>
Date: Wed, 11 Jul 2018 15:03:05 +0200
Subject: [PATCH] TT#37257 Fuse alternative blocks of if-else that should not
 happen concurrently

Change-Id: I3c314926e812058ae2931ad5ff47a712b2c39b18
---
 templates/scripts/includes/deployment.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh
index 1fc8d40..2630cf8 100755
--- a/templates/scripts/includes/deployment.sh
+++ b/templates/scripts/includes/deployment.sh
@@ -668,17 +668,15 @@ for param in "$@" ; do
   shift
 done
 
+set_deploy_status "installing_sipwise_keys"
+install_sipwise_key
+
 if ! "$NGCP_INSTALLER" ; then
   CARRIER_EDITION=false
   PRO_EDITION=false
   CE_EDITION=false
   unset ROLE
-fi
-
-set_deploy_status "installing_sipwise_keys"
-install_sipwise_key
-
-if "$NGCP_INSTALLER" ; then
+else
   set_deploy_status "ensure_augtool_present"
 
   if [ -x /usr/bin/augtool ] ; then
@@ -696,9 +694,7 @@ set_deploy_status "getconfig"
 if [ -z "$TARGET_HOSTNAME" ] ; then
   if "$PRO_EDITION" ; then
     TARGET_HOSTNAME="$ROLE"
-  fi
-
-  if "$CE_EDITION" ; then
+  elif "$CE_EDITION" ; then
     TARGET_HOSTNAME="spce"
   fi