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
b5e912fa
Commit
b5e912fa
authored
Jul 31, 2017
by
Joseph Mulloy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 12.04/precise from utils/scripts OPS-1849
parent
fec3e778
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
22 deletions
+10
-22
util/install/ansible-bootstrap.sh
+2
-6
util/install/sandbox.sh
+1
-1
util/parsefiles_config.yml
+0
-1
util/vpc-tools/abbey.py
+7
-14
No files found.
util/install/ansible-bootstrap.sh
View file @
b5e912fa
...
...
@@ -47,7 +47,6 @@ VIRTUAL_ENV="/tmp/bootstrap"
PYTHON_BIN
=
"
${
VIRTUAL_ENV
}
/bin"
ANSIBLE_DIR
=
"/tmp/ansible"
CONFIGURATION_DIR
=
"/tmp/configuration"
EDX_PPA
=
"deb http://ppa.edx.org precise main"
EDX_PPA_KEY_SERVER
=
"keyserver.ubuntu.com"
EDX_PPA_KEY_ID
=
"B41E5E3969464050"
...
...
@@ -70,10 +69,7 @@ if [[ $(id -u) -ne 0 ]] ;then
exit
1
;
fi
if
grep
-q
'Precise Pangolin'
/etc/os-release
then
SHORT_DIST
=
"precise"
elif
grep
-q
'Trusty Tahr'
/etc/os-release
if
grep
-q
'Trusty Tahr'
/etc/os-release
then
SHORT_DIST
=
"trusty"
elif
grep
-q
'Xenial Xerus'
/etc/os-release
...
...
@@ -82,7 +78,7 @@ then
else
cat
<<
EOF
This script is only known to work on Ubuntu
Precise,
Trusty and Xenial,
This script is only known to work on Ubuntu Trusty and Xenial,
exiting. If you are interested in helping make installation possible
on other platforms, let us know.
...
...
util/install/sandbox.sh
View file @
b5e912fa
#!/bin/bash
##
## Installs the pre-requisites for running edX on a single Ubuntu 1
2
.04
## Installs the pre-requisites for running edX on a single Ubuntu 1
6
.04
## instance. This script is provided as a convenience and any of these
## steps could be executed manually.
##
...
...
util/parsefiles_config.yml
View file @
b5e912fa
...
...
@@ -17,7 +17,6 @@ weights:
-
nginx
:
1
-
xqueue
:
2
-
trusty-common
:
5
-
precise-common
:
4
-
xenial-common
:
6
-
ecommerce
:
6
-
rabbitmq
:
2
...
...
util/vpc-tools/abbey.py
View file @
b5e912fa
...
...
@@ -146,7 +146,7 @@ def parse_args():
group
=
parser
.
add_mutually_exclusive_group
()
group
.
add_argument
(
'-b'
,
'--base-ami'
,
required
=
False
,
help
=
"ami to use as a base ami"
,
default
=
"ami-
0568456c
"
)
default
=
"ami-
cd0f5cb6
"
)
group
.
add_argument
(
'--blessed'
,
action
=
'store_true'
,
help
=
"Look up blessed ami for env-dep-play."
,
default
=
False
)
...
...
@@ -330,7 +330,6 @@ fi
VIRTUAL_ENV_VERSION="15.0.2"
PIP_VERSION="8.1.2"
SETUPTOOLS_VERSION="24.0.3"
EDX_PPA="deb http://ppa.edx.org precise main"
EDX_PPA_KEY_SERVER="keyserver.ubuntu.com"
EDX_PPA_KEY_ID="B41E5E3969464050"
...
...
@@ -353,10 +352,7 @@ if [[ $(id -u) -ne 0 ]] ;then
exit 1;
fi
if grep -q 'Precise Pangolin' /etc/os-release
then
SHORT_DIST="precise"
elif grep -q 'Trusty Tahr' /etc/os-release
if grep -q 'Trusty Tahr' /etc/os-release
then
SHORT_DIST="trusty"
elif grep -q 'Xenial Xerus' /etc/os-release
...
...
@@ -365,7 +361,7 @@ then
else
cat << EOF
This script is only known to work on Ubuntu
Precise,
Trusty and Xenial,
This script is only known to work on Ubuntu Trusty and Xenial,
exiting. If you are interested in helping make installation possible
on other platforms, let us know.
...
...
@@ -391,7 +387,7 @@ apt-get install -y software-properties-common python-software-properties
add-apt-repository -y ppa:git-core/ppa
# For older distributions we need to install a PPA for Python 2.7.10
if [[ "
precise" = "$SHORT_DIST" || "
trusty" = "$SHORT_DIST" ]]; then
if [[ "trusty" = "$SHORT_DIST" ]]; then
# Add python PPA
apt-key adv --keyserver "$EDX_PPA_KEY_SERVER" --recv-keys "$EDX_PPA_KEY_ID"
...
...
@@ -427,12 +423,9 @@ pip install virtualenv=="$VIRTUAL_ENV_VERSION"
# python3 is required for certain other things
# (currently xqwatcher so it can run python2 and 3 grader code,
# but potentially more in the future). It's not available on Ubuntu 12.04,
# but in those cases we don't need it anyways.
if [[ -n "$(apt-cache search --names-only '^python3-pip$')" ]]; then
/usr/bin/apt-get update
/usr/bin/apt-get install -y python3-pip python3-dev
fi
# but potentially more in the future).
/usr/bin/apt-get update
/usr/bin/apt-get install -y python3-pip python3-dev
# this is missing on 14.04 (base package on 12.04)
# we need to do this on any build, since the above apt-get
...
...
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