Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
963b6303
Commit
963b6303
authored
9 years ago
by
Feanil Patel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include the sandbox vars on disk as well.
parent
ae229ce7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
util/jenkins/ansible-provision.sh
+3
-2
No files found.
util/jenkins/ansible-provision.sh
View file @
963b6303
...
...
@@ -63,12 +63,13 @@ if [[ ! -f $BOTO_CONFIG ]]; then
fi
extra_vars_file
=
"/var/tmp/extra-vars-
$$
.yml"
sandbox_vars_file
=
"
${
WORKSPACE
}
/configuration-secure/ansible/vars/developer-sandbox.yml"
extra_var_arg
=
"-e@
${
extra_vars_file
}
"
if
[[
$edx_internal
==
"true"
]]
;
then
# if this is a an edx server include
# the secret var file
extra_var_arg
=
"-e@
${
WORKSPACE
}
/configuration-secure/ansible/vars/developer-sandbox.yml
-e@
${
extra_vars_file
}
"
extra_var_arg
=
"-e@
${
sandbox_vars_file
}
-e@
${
extra_vars_file
}
"
fi
if
[[
-z
$region
]]
;
then
...
...
@@ -261,7 +262,7 @@ fi
# deploy the edx_ansible role
run_ansible edx_ansible.yml
-i
"
${
deploy_host
}
,"
$extra_var_arg
--user
ubuntu
cat
$extra_vars_file
|
grep
-v
-E
"_version|migrate_db"
| tee
${
extra_vars_file
}
_clean
cat
$extra_vars_file
$sandbox_vars_file
|
grep
-v
-E
"_version|migrate_db"
| tee
${
extra_vars_file
}
_clean
ansible
-c
ssh
-i
"
${
deploy_host
}
,"
$deploy_host
-m
copy
-a
"src=
${
extra_vars_file
}
_clean dest=/edx/app/edx_ansible/server-vars.yml"
-u
ubuntu
-b
ret
=
$?
if
[[
$ret
-ne
0
]]
;
then
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment