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
89cc45d6
Unverified
Commit
89cc45d6
authored
May 16, 2017
by
Brandon DeRosier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add optional fallback DNS servers to resolvconf
(cherry picked from commit 6f61a337d6335244dcf4946a4e460b822fb90c5f)
parent
0d0bd3ff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
0 deletions
+22
-0
CHANGELOG.md
+4
-0
playbooks/roles/common/tasks/main.yml
+13
-0
playbooks/roles/common_vars/defaults/main.yml
+5
-0
No files found.
CHANGELOG.md
View file @
89cc45d6
-
Role: common
-
Added
`COMMON_FALLBACK_DNS_SERVERS`
, which optionally adds additional
`nameserver`
entries to the resolvconf tail
-
Explicitly added
`resolvconf`
as a dependency
-
Role: edxapp
-
Role: edxapp
-
Added creation of enterprise_worker user to provisioning. This user is used by the edx-enterprise package when making API requests to Open edX IDAs.
-
Added creation of enterprise_worker user to provisioning. This user is used by the edx-enterprise package when making API requests to Open edX IDAs.
...
...
playbooks/roles/common/tasks/main.yml
View file @
89cc45d6
...
@@ -145,6 +145,19 @@
...
@@ -145,6 +145,19 @@
shell
:
hostname -F /etc/hostname
shell
:
hostname -F /etc/hostname
when
:
COMMON_HOSTNAME|length >0 and (etc_hosts.changed or etc_hostname.changed)
when
:
COMMON_HOSTNAME|length >0 and (etc_hosts.changed or etc_hostname.changed)
-
name
:
Add fallback DNS servers to resolvconf
lineinfile
:
dest
:
/etc/resolvconf/resolv.conf.d/tail
line
:
"
nameserver
{{
item
}}"
create
:
yes
state
:
present
with_items
:
"
{{
COMMON_FALLBACK_DNS_SERVERS
}}"
-
name
:
restart networking
service
:
name
:
networking
state
:
restarted
-
name
:
Copy the templates to their respestive destination
-
name
:
Copy the templates to their respestive destination
template
:
template
:
dest
:
"
{{
item.dest
}}"
dest
:
"
{{
item.dest
}}"
...
...
playbooks/roles/common_vars/defaults/main.yml
View file @
89cc45d6
...
@@ -66,6 +66,9 @@ COMMON_GIT_PATH: 'edx' # git path prefix
...
@@ -66,6 +66,9 @@ COMMON_GIT_PATH: 'edx' # git path prefix
# override this var to set a different hostname
# override this var to set a different hostname
COMMON_HOSTNAME
:
"
"
COMMON_HOSTNAME
:
"
"
# List of DNS server addresses to append to resolvconf
COMMON_FALLBACK_DNS_SERVERS
:
[]
# Set to true to customize DNS search domains
# Set to true to customize DNS search domains
COMMON_CUSTOM_DHCLIENT_CONFIG
:
false
COMMON_CUSTOM_DHCLIENT_CONFIG
:
false
# uncomment and specifity your domains.
# uncomment and specifity your domains.
...
@@ -108,6 +111,7 @@ common_redhat_pkgs:
...
@@ -108,6 +111,7 @@ common_redhat_pkgs:
-
git
-
git
-
unzip
-
unzip
-
acl
-
acl
-
resolvconf
common_debian_pkgs
:
common_debian_pkgs
:
-
apt-transport-https
-
apt-transport-https
-
ntp
-
ntp
...
@@ -119,6 +123,7 @@ common_debian_pkgs:
...
@@ -119,6 +123,7 @@ common_debian_pkgs:
-
unzip
-
unzip
-
python-pip
-
python-pip
-
python2.7-dev
-
python2.7-dev
-
resolvconf
# Packages that should be installed from our custom PPA, i.e. COMMON_EDX_PPA
# Packages that should be installed from our custom PPA, i.e. COMMON_EDX_PPA
old_python_debian_pkgs
:
old_python_debian_pkgs
:
...
...
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