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
OpenEdx
configuration
Commits
a1509d2e
Commit
a1509d2e
authored
9 years ago
by
Edward Zarecor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix pushed conflict markers
parent
674d052e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
12 deletions
+3
-12
util/jenkins/ansible-provision.sh
+3
-12
No files found.
util/jenkins/ansible-provision.sh
View file @
a1509d2e
#
!/usr/bin/env bash
!
/usr/bin/env bash
# Ansible provisioning wrapper script that
# assumes the following parameters set
...
...
@@ -259,20 +259,14 @@ PROGRAMS_LMS_URL_ROOT: "https://${deploy_host}"
PROGRAMS_URL_ROOT: "https://programs-
${
deploy_host
}
"
PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
<<<<<<< HEAD
CREDENTIALS_LMS_URL_ROOT: "https://
${
deploy_host
}
"
CREDENTIALS_URL_ROOT: "https://credentials-
${
deploy_host
}
"
CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
COURSE_DISCOVERY_ECOMMERCE_API_URL: "https://ecommerce-
${
deploy_host
}
/api/v2"
COURSE_DISCOVERY_OAUTH_URL_ROOT: "https://
${
deploy_host
}
"
COURSE_DISCOVERY_URL_ROOT: "https://course-discovery-
${
deploy_host
}
"
COURSE_DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
=======
DISCOVERY_OAUTH_URL_ROOT: "https://
${
deploy_host
}
"
DISCOVERY_URL_ROOT: "https://discovery-
${
deploy_host
}
"
DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
>>>>>>> 5f930fc... modified the name inside all playbooks
EOF
fi
...
...
@@ -318,11 +312,8 @@ EOF
fi
declare
-A
deploy
<<<<<<
< HEAD
roles
=
"edxapp forum ecommerce programs credentials course_discovery notifier xqueue xserver certs demo testcourses"
=======
roles
=
"edxapp forum ecommerce programs discovery notifier xqueue xserver certs demo testcourses"
>>>>>>>
5f930fc... modified the name inside all playbooks
roles
=
"edxapp forum ecommerce programs credentials discovery notifier xqueue xserver certs demo testcourses"
for
role
in
$roles
;
do
deploy[
$role
]=
${
!role
}
done
...
...
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