TT#37257 Carrier is a specialisation of Pro

The variables related to Pro edition (at least Role) needs to be present when
installing some nodes Carrier, otherwise the installation doesn't work as
expected.

Change-Id: Ibea819889f42559626164b9e344670edea5cad1b

templates/scripts/includes/deployment.sh

@@ -383,9 +383,6 @@ elif checkBootParam ngcppro || checkBootParam ngcpsp1 || checkBootParam ngcpsp2
   else
     ROLE=sp1
   fi
-elif checkBootParam 'ngcpcrole=' ; then
-  CROLE=$(getBootParam ngcpcrole)
-  CARRIER_EDITION=true
 elif checkBootParam "puppetenv=" ; then
   # will be determined later
   :
@@ -394,6 +391,12 @@ else
   exit 1
 fi
 
+# Carrier is a specialisation of Pro, Pro Role variables are needed
+if checkBootParam 'ngcpcrole=' ; then
+  CROLE=$(getBootParam ngcpcrole)
+  CARRIER_EDITION=true
+fi
+
 if checkBootParam "puppetenv=" ; then
   # we expected to get the environment for puppet
   PUPPET=$(getBootParam puppetenv)