Commit 67a65be8 by Han Su Kim

Merge pull request #1210 from edx/han/ansible-provision

Adding an option to bring up sandboxes based on Ubuntu 14.04
parents 45d08df3 0a277982
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# - dns_name # - dns_name
# - environment # - environment
# - name_tag # - name_tag
env env
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
...@@ -84,6 +84,8 @@ if [[ -z $ami ]]; then ...@@ -84,6 +84,8 @@ if [[ -z $ami ]]; then
ami="ami-97dbc3fe" ami="ami-97dbc3fe"
elif [[ $server_type == "ubuntu_12.04" || $server_type == "full_edx_installation_from_scratch" ]]; then elif [[ $server_type == "ubuntu_12.04" || $server_type == "full_edx_installation_from_scratch" ]]; then
ami="ami-59a4a230" ami="ami-59a4a230"
elif [[ $server_type == "ubuntu_14.04(experimental)" ]]; then
ami="ami-408c7f28"
fi fi
fi fi
...@@ -212,7 +214,7 @@ done ...@@ -212,7 +214,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
fi fi
if [[ $server_type == "full_edx_installation" ]]; then if [[ $server_type == "full_edx_installation" ]]; then
......
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