Commit 129a0d5a by John Jarvis

Merge pull request #1276 from edx/jarv/show-diffs

always show diffs
parents a742727a 30868994
...@@ -201,13 +201,13 @@ EOF ...@@ -201,13 +201,13 @@ EOF
# run the tasks to launch an ec2 instance from AMI # run the tasks to launch an ec2 instance from AMI
cat $extra_vars_file cat $extra_vars_file
ansible-playbook edx_provision.yml -i inventory.ini $extra_var_arg --user ubuntu -v ansible-playbook edx_provision.yml -i inventory.ini $extra_var_arg --user ubuntu -v -D
if [[ $server_type == "full_edx_installation" ]]; then if [[ $server_type == "full_edx_installation" ]]; then
# additional tasks that need to be run if the # additional tasks that need to be run if the
# entire edx stack is brought up from an AMI # entire edx stack is brought up from an AMI
ansible-playbook rabbitmq.yml -i "${deploy_host}," $extra_var_arg --user ubuntu ansible-playbook rabbitmq.yml -i "${deploy_host}," $extra_var_arg --user ubuntu -D
ansible-playbook restart_supervisor.yml -i "${deploy_host}," $extra_var_arg --user ubuntu ansible-playbook restart_supervisor.yml -i "${deploy_host}," $extra_var_arg --user ubuntu -D
fi fi
fi fi
...@@ -221,7 +221,7 @@ done ...@@ -221,7 +221,7 @@ done
# run non-deploy tasks for all roles # run non-deploy tasks for all roles
if [[ $reconfigure == "true" || $server_type == "full_edx_installation_from_scratch" ]]; then if [[ $reconfigure == "true" || $server_type == "full_edx_installation_from_scratch" ]]; then
cat $extra_vars_file cat $extra_vars_file
ansible-playbook edx_continuous_integration.yml -i "${deploy_host}," $extra_var_arg --user ubuntu ansible-playbook edx_continuous_integration.yml -i "${deploy_host}," $extra_var_arg --user ubuntu -D
fi fi
if [[ $reconfigure != "true" && $server_type == "full_edx_installation" ]]; then if [[ $reconfigure != "true" && $server_type == "full_edx_installation" ]]; then
...@@ -229,15 +229,15 @@ if [[ $reconfigure != "true" && $server_type == "full_edx_installation" ]]; then ...@@ -229,15 +229,15 @@ if [[ $reconfigure != "true" && $server_type == "full_edx_installation" ]]; then
for i in $roles; do for i in $roles; do
if [[ ${deploy[$i]} == "true" ]]; then if [[ ${deploy[$i]} == "true" ]]; then
cat $extra_vars_file cat $extra_vars_file
ansible-playbook ${i}.yml -i "${deploy_host}," $extra_var_arg --user ubuntu --tags deploy -v ansible-playbook ${i}.yml -i "${deploy_host}," $extra_var_arg --user ubuntu --tags deploy -v -D
fi fi
done done
fi fi
# deploy the edx_ansible role # deploy the edx_ansible role
ansible-playbook edx_ansible.yml -i "${deploy_host}," $extra_var_arg --user ubuntu ansible-playbook edx_ansible.yml -i "${deploy_host}," $extra_var_arg --user ubuntu -D
# set the hostname # set the hostname
ansible-playbook set_hostname.yml -i "${deploy_host}," -e hostname_fqdn=${deploy_host} --user ubuntu ansible-playbook set_hostname.yml -i "${deploy_host}," -e hostname_fqdn=${deploy_host} --user ubuntu -D
rm -f "$extra_vars_file" rm -f "$extra_vars_file"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment