Commit 7b643f43 by John Jarvis

use jenkins user instead of entering git username

parent 5e43b314
...@@ -20,9 +20,8 @@ ...@@ -20,9 +20,8 @@
export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
if [[ $github_username == "PUT_YOUR_GITHUB_USERNAME_HERE" ]]; then if [[ -z $github_username ]]; then
echo "You need to specify a git username to create an ec2 instance" github_username=$BUILD_USER
exit 1
fi fi
if [[ ! -f $BOTO_CONFIG ]]; then if [[ ! -f $BOTO_CONFIG ]]; then
...@@ -70,7 +69,7 @@ instance_type: $instance_type ...@@ -70,7 +69,7 @@ instance_type: $instance_type
security_group: $security_group security_group: $security_group
ami: $ami ami: $ami
region: $region region: $region
instance_tags: '{"environment": "$environment", "github_username": "$github_username", "Name": "$name_tag", "source": "jenkins"}' instance_tags: '{"environment": "$environment", "github_username": "$github_username", "Name": "$name_tag", "source": "jenkins", "owner": "$BUILD_USER"}'
root_ebs_size: $root_ebs_size root_ebs_size: $root_ebs_size
gh_users: gh_users:
- user: jarv - user: jarv
...@@ -97,7 +96,7 @@ cd playbooks/edx-east ...@@ -97,7 +96,7 @@ cd playbooks/edx-east
ansible-playbook -vvvv edx_provision.yml -i inventory.ini -e "@${extra_vars}" --user ubuntu ansible-playbook -vvvv edx_provision.yml -i inventory.ini -e "@${extra_vars}" --user ubuntu
# run tasks to update application config files that # run tasks to update application config files that
# for the hostnames # for the hostnames
if [[ $server_type == "full_edx_stack" ]]; then if [[ $server_type == "full_edx_installation" ]]; then
ansible-playbook -vvvv edx_continuous_integration.yml -i "${dns_name}.${dns_zone}," -e "@${extra_vars}" --user ubuntu ansible-playbook -vvvv edx_continuous_integration.yml -i "${dns_name}.${dns_zone}," -e "@${extra_vars}" --user ubuntu
fi fi
rm -f "$extra_vars" rm -f "$extra_vars"
......
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