Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183786
Change subject: install-server: drop lucid support for DHCP
......................................................................
install-server: drop lucid support for DHCP
No lucid DHCP servers anymore, we can drop all the extra cruft.
Change-Id: Ie3dd4a0aad1c5c38c23266eb22d64b7169b997d8
---
M modules/install-server/manifests/dhcp-server.pp
M modules/install-server/spec/classes/install_server_dhcp_server_spec.rb
2 files changed, 10 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/183786/1
diff --git a/modules/install-server/manifests/dhcp-server.pp
b/modules/install-server/manifests/dhcp-server.pp
index 64daaa6..715af29 100644
--- a/modules/install-server/manifests/dhcp-server.pp
+++ b/modules/install-server/manifests/dhcp-server.pp
@@ -13,18 +13,9 @@
# include install-server::dhcp-server
class install-server::dhcp-server {
- if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '12.04') >=
0 {
- $confdir = '/etc/dhcp/'
- $package_name = 'isc-dhcp-server'
- $service_name = 'isc-dhcp-server'
- } else {
- $confdir = '/etc/dhcp3'
- $package_name = 'dhcp3-server'
- $service_name = 'dhcp3-server'
- }
- file { $confdir:
+ file { '/etc/dhcp':
ensure => directory,
- require => Package[$package_name],
+ require => Package['isc-dhcp-server'],
recurse => true,
owner => 'root',
group => 'root',
@@ -32,16 +23,16 @@
source => 'puppet:///modules/install-server/dhcpd',
}
- package { $package_name:
- ensure => latest;
+ package { 'isc-dhcp-server':
+ ensure => present,
}
- service { $service_name:
+ service { 'isc-dhcp-server':
ensure => running,
require => [
- Package[$package_name],
- File[$confdir]
+ Package['isc-dhcp-server'],
+ File['/etc/dhcp']
],
- subscribe => File[$confdir],
+ subscribe => File['/etc/dhcp'],
}
}
diff --git
a/modules/install-server/spec/classes/install_server_dhcp_server_spec.rb
b/modules/install-server/spec/classes/install_server_dhcp_server_spec.rb
index 878a213..b6260af 100644
--- a/modules/install-server/spec/classes/install_server_dhcp_server_spec.rb
+++ b/modules/install-server/spec/classes/install_server_dhcp_server_spec.rb
@@ -1,27 +1,8 @@
require 'spec_helper'
describe 'install-server::dhcp-server', :type => :class do
- let(:facts) { { :lsbdistid => 'Ubuntu', :lsbdistrelease => '10.04' } }
-
- it 'should have dhcp3-server with <=12.04' do
- should contain_package('dhcp3-server').with_ensure('latest')
- should contain_service('dhcp3-server').with_ensure('running')
-
- should contain_file('/etc/dhcp3/').with({
- 'ensure' => 'directory',
- 'mode' => '0444',
- 'owner' => 'root',
- 'group' => 'root',
- 'recurse' => 'true',
- })
- end
-end
-
-describe 'install-server::dhcp-server', :type => :class do
- let(:facts) { { :lsbdistid => 'Ubuntu', :lsbdistrelease => '12.04' } }
-
- it 'should have isc-dhcp-server with <=12.04' do
- should contain_package('isc-dhcp-server').with_ensure('latest')
+ it 'should have isc-dhcp-server' do
+ should contain_package('isc-dhcp-server').with_ensure('present')
should contain_service('isc-dhcp-server').with_ensure('running')
should contain_file('/etc/dhcp/').with({
--
To view, visit https://gerrit.wikimedia.org/r/183786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3dd4a0aad1c5c38c23266eb22d64b7169b997d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
