Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
base
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lonlone Lee
base
Commits
c3afd82d
Commit
c3afd82d
authored
Jan 12, 2016
by
Karl Kornel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Livermore-specific DNS
parent
f54d9aff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
20 deletions
+4
-20
NEWS
NEWS
+4
-0
manifests/dns.pp
manifests/dns.pp
+0
-11
manifests/dns/resolv_conf.pp
manifests/dns/resolv_conf.pp
+0
-5
templates/dns/etc/resolv.conf.erb
templates/dns/etc/resolv.conf.erb
+0
-4
No files found.
NEWS
View file @
c3afd82d
unreleased
(
TBD
)
[
dns
]
Remove
Livermore
-
specific
DNS
(
anycast
works
there
now
).
(
akkornel
)
release
/
004.057
(
2016
-
01
-
11
)
[
puppetclient
]
strip
special
treatment
for
Puppet
2.
X
hosts
(
jlent
)
...
...
manifests/dns.pp
View file @
c3afd82d
...
...
@@ -15,21 +15,10 @@ class base::dns(
$no_resolv_conf
=
false
,
$dns_cache
=
'NONE'
,
)
{
# Check if we are in Livermore, based on IP address
if
(
ip_in_cidr
(
$::ipaddress
,
'204.63.224.0/21'
)
or
ip_in_cidr
(
$::ipaddress
,
'172.20.224.0/21'
)
)
{
$livermore
=
true
}
else
{
$livermore
=
false
}
if
(
!
$no_resolv_conf
)
{
base::dns::resolv_conf
{
$::fqdn_lc
:
ensure
=>
present
,
dns_cache
=>
$dns_cache
,
livermore
=>
$livermore
,
}
}
}
manifests/dns/resolv_conf.pp
View file @
c3afd82d
...
...
@@ -7,7 +7,6 @@ define base::dns::resolv_conf (
$dns_cache
=
'NONE'
,
$first_dns_server
=
'NONE'
,
$is_dns_server
=
false
,
$livermore
=
false
,
)
{
if
$::lsbdistcodename
==
'santiago'
{
$set_dns_options
=
true
...
...
@@ -22,10 +21,6 @@ define base::dns::resolv_conf (
$set_dns_cache
=
false
}
if
$livermore
{
$set_livermore_dns
=
true
}
if
$first_dns_server
!=
'NONE'
{
$set_first_dns_server
=
true
}
else
{
...
...
templates/dns/etc/resolv.conf.erb
View file @
c3afd82d
...
...
@@ -50,10 +50,6 @@ nameserver 127.0.0.1
<%
if
@set_first_dns_server
-%>
nameserver
<%=
first_dns_server
%>
<%
end
-%>
<%
if
@set_livermore_dns
-%>
# Livermore DNS server (as of June 2015, there's no anycast in Livermore)
nameserver 204.63.227.68
<%
end
-%>
# Stanford anycast DNS servers
nameserver 171.64.1.234
nameserver 171.67.1.234
...
...
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