Merge pull request #3900 from edx/nadeem/skip-elb-operations

Skip elb operations in CreateSandbox job with full_edx_installation

util/jenkins/ansible-provision.sh

@@ -322,7 +322,7 @@ EOF
 
 
     if [[ $server_type == "full_edx_installation" ]]; then
-        extra_var_arg+=' -e instance_userdata="" -e launch_wait_time=0'
+        extra_var_arg+=' -e instance_userdata="" -e launch_wait_time=0 -e elb_pre_post=false'
     fi
     # run the tasks to launch an ec2 instance from AMI
     cat $extra_vars_file
@@ -331,7 +331,7 @@ EOF
     if [[ $server_type == "full_edx_installation" ]]; then
         # additional tasks that need to be run if the
         # entire edx stack is brought up from an AMI
-        run_ansible rabbitmq.yml -i "${deploy_host}," $extra_var_arg -e 'elb_pre_post=false' --user ubuntu
+        run_ansible rabbitmq.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
         run_ansible restart_supervisor.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
     fi
 fi