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
ddc9e506
Commit
ddc9e506
authored
Oct 03, 2014
by
David Baumgold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OPENEDX_RELEASE doesn't work properly with variable inheritance in ansible
parent
5267e9db
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
9 deletions
+20
-9
playbooks/vagrant-devstack.yml
+0
-6
vagrant/base/devstack/Vagrantfile
+7
-1
vagrant/base/fullstack/Vagrantfile
+7
-1
vagrant/release/devstack/Vagrantfile
+6
-1
No files found.
playbooks/vagrant-devstack.yml
View file @
ddc9e506
...
...
@@ -12,12 +12,6 @@
COMMON_MOTD_TEMPLATE
:
'
devstack_motd.tail.j2'
COMMON_SSH_PASSWORD_AUTH
:
"
yes"
ENABLE_LEGACY_ORA
:
!!null
# used for releases
edx_platform_version
:
'
{{
OPENEDX_RELEASE
|
default("master")
}}'
ora2_version
:
'
{{
OPENEDX_RELEASE
|
default("master")
}}'
certs_version
:
'
{{
OPENEDX_RELEASE
|
default("master")
}}'
forum_version
:
'
{{
OPENEDX_RELEASE
|
default("master")
}}'
xqueue_version
:
'
{{
OPENEDX_RELEASE
|
default("master")
}}'
vars_files
:
-
"
group_vars/all"
roles
:
...
...
vagrant/base/devstack/Vagrantfile
View file @
ddc9e506
...
...
@@ -107,7 +107,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
ansible
.
extra_vars
[
'ENABLE_LEGACY_ORA'
]
=
true
end
if
ENV
[
'OPENEDX_RELEASE'
]
ansible
.
extra_vars
[
'OPENEDX_RELEASE'
]
=
ENV
[
'OPENEDX_RELEASE'
]
ansible
.
extra_vars
=
{
edx_platform_version:
ENV
[
'OPENEDX_RELEASE'
],
ora2_version:
ENV
[
'OPENEDX_RELEASE'
],
certs_version:
ENV
[
'OPENEDX_RELEASE'
],
forum_version:
ENV
[
'OPENEDX_RELEASE'
],
xqueue_version:
ENV
[
'OPENEDX_RELEASE'
],
}
end
end
end
vagrant/base/fullstack/Vagrantfile
View file @
ddc9e506
...
...
@@ -44,7 +44,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# they are written out to /edx/etc/server-vars.yml which can
# be used later when running ansible locally
if
ENV
[
'OPENEDX_RELEASE'
]
ansible
.
extra_vars
=
{
OPENEDX_RELEASE
:
ENV
[
'OPENEDX_RELEASE'
]}
ansible
.
extra_vars
=
{
edx_platform_version:
ENV
[
'OPENEDX_RELEASE'
],
ora2_version:
ENV
[
'OPENEDX_RELEASE'
],
certs_version:
ENV
[
'OPENEDX_RELEASE'
],
forum_version:
ENV
[
'OPENEDX_RELEASE'
],
xqueue_version:
ENV
[
'OPENEDX_RELEASE'
],
}
end
end
end
vagrant/release/devstack/Vagrantfile
View file @
ddc9e506
...
...
@@ -20,7 +20,12 @@ cd /edx/app/edx_ansible/edx_ansible/playbooks
# Did we specify an openedx release?
if [ -n "$OPENEDX_RELEASE" ]; then
EXTRA_VARS="-e OPENEDX_RELEASE=$OPENEDX_RELEASE"
EXTRA_VARS="-e edx_platform_version=$OPENEDX_RELEASE \
-e ora2_version=$OPENEDX_RELEASE \
-e certs_version=$OPENEDX_RELEASE \
-e forum_version=$OPENEDX_RELEASE \
-e xqueue_version=$OPENEDX_RELEASE \
"
CONFIG_VER=$OPENEDX_RELEASE
else
CONFIG_VER="release"
...
...
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