openstack
/
fuel-library
Code Issues Proposed changes

[sync/mitaka] Configure the Postfix to Local delivery only mode 

This change configures Postfix to Local delivery mode only.
Partially cherry-picked from I0d47a102ed36b6ab69874cd92735cd46dcf5f593

Change-Id: Ic97c82ec9b97cf0d09b11e3c6ce691aadc3624eb
Closes-Bug: 1603916
Co-Authored-By: Alex Schultz <aschultz@mirantis.com>
Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
This commit is contained in:
Maksim Malchuk 2016-07-15 18:40:56 +03:00 committed by Dmitry Ilyin
parent 9808f852e1
commit 765d3ed78e
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
deployment/puppet/osnailyfacter/manifests/tools/tools.pp
View File

@ -24,6 +24,27 @@ class osnailyfacter::tools::tools {
class { '::osnailyfacter::ssh': }
ensure_packages(['postfix'])
service { 'postfix':
ensure => running,
enable => true,
require => Package['postfix'],
}
augeas { 'configure postfix':
context => '/files/etc/postfix/main.cf',
changes => [
"set /files/etc/postfix/main.cf/mydestination ${::fqdn},localhost",
"set /files/etc/postfix/main.cf/myhostname ${::fqdn}",
'set /files/etc/postfix/main.cf/inet_interfaces loopback-only',
'set /files/etc/postfix/main.cf/default_transport error',
'set /files/etc/postfix/main.cf/relay_transport error',
],
notify => Service['postfix'],
require => Package['postfix'],
}
if $::virtual != 'physical' {
class { '::osnailyfacter::acpid': }
}

15
tests/noop/spec/hosts/tools/tools_spec.rb
View File

@ -68,6 +68,21 @@ describe manifest do
)
end
it 'should configure postfix with correct settings' do
should contain_package('postfix')
should contain_service('postfix')
should contain_augeas('configure postfix').with(
'context' => '/files/etc/postfix/main.cf',
'changes' => [
"set /files/etc/postfix/main.cf/mydestination #{facts[:fqdn]},localhost",
"set /files/etc/postfix/main.cf/myhostname #{facts[:fqdn]}",
"set /files/etc/postfix/main.cf/inet_interfaces loopback-only",
"set /files/etc/postfix/main.cf/default_transport error",
"set /files/etc/postfix/main.cf/relay_transport error",
],
).that_notifies('Service[postfix]')
end
it 'should declare osnailyfacter::acpid on virtual machines' do
facts[:virtual] = 'kvm'
should contain_class('osnailyfacter::acpid')