Merge pull request #172 from jfdenise/CLOUD-3471

Fix for CLOUD-3471, Can't run multiple server during migration

Author: jmesnil

os-eap-migration/added/launch/openshift-migrate-common.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 # Openshift EAP common migration script
 
-source ${JBOSS_HOME}/bin/launch/launch.sh
 source ${JBOSS_HOME}/bin/probe_common.sh
 source /opt/partition/partitionPV.sh
 
@@ -15,9 +14,6 @@ function runMigration() {
 
   cp -f ${STANDALONE_XML_COPY} ${STANDALONE_XML}
 
-  # exposed by wildfly-cekit-modules
-  configure_server
-
   echo "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
 
   local txOptions="-Dcom.arjuna.ats.arjuna.common.RecoveryEnvironmentBean.recoveryBackoffPeriod=1 -Dcom.arjuna.ats.arjuna.common.RecoveryEnvironmentBean.periodicRecoveryPeriod=1 -Dcom.arjuna.ats.jta.common.JTAEnvironmentBean.orphanSafetyInterval=1"

os-eap-txnrecovery/bash/added/partitionPV.sh

@@ -174,6 +174,11 @@ function migratePV() {
     done
   fi
 
+  # server can only be configured once due to CLI script being executed
+  # doing it before the loop that will start a server per directory.
+  source $JBOSS_HOME/bin/launch/launch.sh
+  configure_server
+
   while true ; do
 
     if $IS_TX_SQL_BACKEND; then