Skip to content

Commit

Permalink
(maint) Update references from neptune.* to enterprise.delivery.puppe…
Browse files Browse the repository at this point in the history
…tlabs.net
  • Loading branch information
Rob Braden committed Aug 4, 2014
1 parent 34c4199 commit 401e351
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion spec/defines/pe_mock_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@


let(:title) { "pupent-#{param_set[:pe_ver]}-#{param_set[:dist]}-#{param_set[:arch]}" }
let(:expected_pe_repo) { "http:\/\/neptune.puppetlabs.lan\/#{param_set[:pe_ver]}\/repos\/#{param_set[:dist]}-#{param_set[:release]}-#{param_set[:arch]}"
let(:expected_pe_repo) { "http:\/\/enterprise.delivery.puppetlabs.net\/#{param_set[:pe_ver]}\/repos\/#{param_set[:dist]}-#{param_set[:release]}-#{param_set[:arch]}"
}

it { should contain_file(title).with(
Expand Down
6 changes: 3 additions & 3 deletions templates/pe-el-mock-config.erb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ syslog_device=
# repos
[groups-<%=@dist%>-<%=@release%>-<%=@arch%>]
name=groups-<%=@dist%>-<%=@release%>-<%=@arch%>
baseurl=http://neptune.delivery.puppetlabs.net/buildgroups/rhel<%=@release%>/<%=@arch%>/
baseurl=http://enterprise.delivery.puppetlabs.net/buildgroups/rhel<%=@release%>/<%=@arch%>/
proxy=_none_
<% end -%>

Expand All @@ -58,15 +58,15 @@ baseurl=http://osmirror.delivery.puppetlabs.net/cent<%=@release%>latestserver-<%
[pe-<%=@dist%>-<%=@release%>-<%=@arch%>]
name=pe-<%=@dist%>-<%=@release%>-<%=@arch%>
enabled=1
baseurl=http://neptune.puppetlabs.lan/<%=@pe_ver%>/repos/<%=@dist%>-<%=@release%>-<%=@arch%>/
baseurl=http://enterprise.delivery.puppetlabs.net/<%=@pe_ver%>/repos/<%=@dist%>-<%=@release%>-<%=@arch%>/
skip_if_unavailable=1
proxy=_none_

<% if @dist == "el" -%>
[build-tools-<%=@dist%>-<%=@release%>-<%=@arch%>]
name=build-tools-<%=@dist%>-<%=@release%>-<%=@arch%>
enabled=1
baseurl=http://neptune.delivery.puppetlabs.net/build-tools/<%=@dist%>/<%=@release%>/<%=@arch%>/
baseurl=http://enterprise.delivery.puppetlabs.net/build-tools/<%=@dist%>/<%=@release%>/<%=@arch%>/
skip_if_unavailable=1
proxy=_none_
<% end -%>
Expand Down
4 changes: 2 additions & 2 deletions templates/pe-sles-mock-config.erb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ syslog_device=
name=<%=@dist%>-<%=@release%>-<%=t_arch%>-os
enabled=1
<% if @release == '10' %>
baseurl='http://neptune.delivery.puppetlabs.net/<%=@dist%>/<%=@release%>/<%=t_arch%>/'
baseurl='http://enterprise.delivery.puppetlabs.net/<%=@dist%>/<%=@release%>/<%=t_arch%>/'
<% else %>
baseurl='http://osmirror.delivery.puppetlabs.net/<%=@dist%>-<%=@release%>-<%=@sp%>-<%=t_arch%>-latest-<%=t_arch%>/RPMS.os/'
<% end %>
Expand All @@ -58,7 +58,7 @@ gpgcheck=0
[pe-<%=@dist%>-<%=@release%>-<%=@arch%>]
name=pe-<%=@dist%>-<%=@release%>-<%=@arch%>
enabled=1
baseurl='http://neptune.puppetlabs.lan/<%=@pe_ver%>/repos/<%=@dist%>-<%=@release%>-<%=@arch%>/'
baseurl='http://enterprise.delivery.puppetlabs.net/<%=@pe_ver%>/repos/<%=@dist%>-<%=@release%>-<%=@arch%>/'
skip_if_unavailable=1
proxy=_none_
"""

0 comments on commit 401e351

Please sign in to comment.