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
83fe48e5
Commit
83fe48e5
authored
Jan 03, 2017
by
John Eskew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove occurrences of ANSIBLE_REPO/VERSION.
parent
46405e75
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
27 deletions
+4
-27
docker/build/precise-common/Dockerfile
+2
-3
docker/build/trusty-common/Dockerfile
+1
-2
docker/build/xenial-common/Dockerfile
+1
-2
util/install/ansible-bootstrap.sh
+0
-10
util/vpc-tools/abbey.py
+0
-10
No files found.
docker/build/precise-common/Dockerfile
View file @
83fe48e5
FROM
ubuntu:precise
MAINTAINER
edxops
FROM
ubuntu:precise
MAINTAINER
edxops
# Set locale to UTF-8 which is not the default for docker.
# See the links for details:
...
...
@@ -8,7 +8,6 @@ MAINTAINER edxops
# https://github.com/docker-library/python/pull/14/files
ENV
LANG C.UTF-8
ENV
ANSIBLE_REPO="https://github.com/edx/ansible"
ENV
CONFIGURATION_REPO="https://github.com/edx/configuration.git"
ENV
CONFIGURATION_VERSION="master"
...
...
docker/build/trusty-common/Dockerfile
View file @
83fe48e5
FROM
ubuntu:trusty
MAINTAINER
edxops
ENV
ANSIBLE_REPO="https://github.com/edx/ansible"
MAINTAINER
edxops
ENV
CONFIGURATION_REPO="https://github.com/edx/configuration.git"
ENV
CONFIGURATION_VERSION="master"
...
...
docker/build/xenial-common/Dockerfile
View file @
83fe48e5
FROM
ubuntu:xenial
MAINTAINER
edxops
MAINTAINER
edxops
# Set locale to UTF-8 which is not the default for docker.
# See the links for details:
...
...
@@ -8,7 +8,6 @@ MAINTAINER edxops
# https://github.com/docker-library/python/pull/14/files
ENV
LANG C.UTF-8
ENV
ANSIBLE_REPO="https://github.com/edx/ansible"
ENV
CONFIGURATION_REPO="https://github.com/edx/configuration.git"
ENV
CONFIGURATION_VERSION="master"
...
...
util/install/ansible-bootstrap.sh
View file @
83fe48e5
...
...
@@ -13,14 +13,6 @@
set
-xe
if
[[
-z
"
${
ANSIBLE_REPO
}
"
]]
;
then
ANSIBLE_REPO
=
"https://github.com/edx/ansible.git"
fi
if
[[
-z
"
${
ANSIBLE_VERSION
}
"
]]
;
then
ANSIBLE_VERSION
=
"master"
fi
if
[[
-z
"
${
CONFIGURATION_REPO
}
"
]]
;
then
CONFIGURATION_REPO
=
"https://github.com/edx/configuration.git"
fi
...
...
@@ -56,8 +48,6 @@ cat << EOF
Running the edx_ansible bootstrap script with the following arguments:
ANSIBLE_REPO="
${
ANSIBLE_REPO
}
"
ANSIBLE_VERSION="
${
ANSIBLE_VERSION
}
"
CONFIGURATION_REPO="
${
CONFIGURATION_REPO
}
"
CONFIGURATION_VERSION="
${
CONFIGURATION_VERSION
}
"
...
...
util/vpc-tools/abbey.py
View file @
83fe48e5
...
...
@@ -304,14 +304,6 @@ export HIPCHAT_MSG_COLOR DATADOG_API_KEY
#################################### Lifted from ansible-bootstrap.sh
if [[ -z "$ANSIBLE_REPO" ]]; then
ANSIBLE_REPO="https://github.com/edx/ansible.git"
fi
if [[ -z "$ANSIBLE_VERSION" ]]; then
ANSIBLE_VERSION="master"
fi
if [[ -z "$CONFIGURATION_REPO" ]]; then
CONFIGURATION_REPO="https://github.com/edx/configuration.git"
fi
...
...
@@ -339,8 +331,6 @@ cat << EOF
Running the abbey with the following arguments:
ANSIBLE_REPO="$ANSIBLE_REPO"
ANSIBLE_VERSION="$ANSIBLE_VERSION"
CONFIGURATION_REPO="$CONFIGURATION_REPO"
CONFIGURATION_VERSION="$CONFIGURATION_VERSION"
...
...
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