openstack/fuel-library
Code Issues Proposed changes

Merge "Set 0644 mode for ntp and dnsmasq services"

Browse Source
This commit is contained in:
Jenkins 2015-03-21 09:34:47 +00:00 committed by Gerrit Code Review
commit a636c680e3
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/puppet/cluster/manifests/dns_ocf.pp
View File

@ -38,6 +38,11 @@ class cluster::dns_ocf ( $primary_controller ) {
Cs_resource[$service_name] ~> Service[$service_name]
}
file { '/etc/init.d/dnsmasq':
ensure => present,
mode => '0644',
} ->
file {'dns-ocf':
path =>'/usr/lib/ocf/resource.d/fuel/ns_dns',
mode => '0755',

21
deployment/puppet/cluster/manifests/ntp_ocf.pp
View File

@ -38,6 +38,17 @@ class cluster::ntp_ocf ( $primary_controller ) {
Cs_resource[$service_name] ~> Service[$service_name]
}
$service_path = $osfamily ? {
/(RedHat|CentOS)/ => '/etc/init.d/ntpd',
/(Debian|Ubuntu)/ => '/etc/init.d/ntp',
default => '/etc/init.d/ntp',
}
file { $service_path:
ensure => present,
mode => '0644',
} ->
file {'ntp-ocf':
path =>'/usr/lib/ocf/resource.d/fuel/ns_ntp',
mode => '0755',
@ -47,11 +58,9 @@ class cluster::ntp_ocf ( $primary_controller ) {
} ~>
service { $service_name:
name => $service_name,
enable => true,
ensure => 'running',
hasstatus => true,
hasrestart => true,
provider => 'pacemaker',
name => $service_name,
enable => true,
ensure => 'running',
provider => 'pacemaker',
}
}