diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2015-04-21 13:14:11 +0200 |
|---|---|---|
| committer | Michal Skalski <mskalski@mirantis.com> | 2015-04-21 13:22:41 +0200 |
| commit | 1777d5b64e49ef2eb834aa6f6cd6c6411f60d76a (patch) | |
| tree | 3c2d55156df9ad82cbe25e71435742d9c32374b5 /fuel/build/f_resolvconf/puppet/modules/opnfv/manifests | |
| parent | e1d29739ccbc6efc20f400636a211dae0e75bff4 (diff) | |
Allow deployment on Centos 6.5 environment
Modify Fuel@OPNFV puppet manifest to allow deployment on CentOS 6.5
environment. Add installation of docker-io centos package on controller
nodes.
Change-Id: I76cdd086607f279f46d827558c878b7be0d8314f
JIRA: BGS-36
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Diffstat (limited to 'fuel/build/f_resolvconf/puppet/modules/opnfv/manifests')
| -rw-r--r-- | fuel/build/f_resolvconf/puppet/modules/opnfv/manifests/resolver.pp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/fuel/build/f_resolvconf/puppet/modules/opnfv/manifests/resolver.pp b/fuel/build/f_resolvconf/puppet/modules/opnfv/manifests/resolver.pp index be4e67d..44f36a2 100644 --- a/fuel/build/f_resolvconf/puppet/modules/opnfv/manifests/resolver.pp +++ b/fuel/build/f_resolvconf/puppet/modules/opnfv/manifests/resolver.pp @@ -48,16 +48,26 @@ class opnfv::resolver() mode => '0644', content => template('opnfv/resolv.conf.erb'), } -# /etc/resolv.conf is re-generated at each boot by resolvconf, so we -# need to store there as well. - file { '/etc/resolvconf/resolv.conf.d/head': + + # /etc/resolv.conf is re-generated at each boot by resolvconf, so we + # need to store there as well. + + case $::operatingsystem { + 'ubuntu': { + file { '/etc/resolvconf/resolv.conf.d/head': owner => root, group => root, mode => '0644', content => template('opnfv/resolv.conf.erb'), + } + } + 'centos': { + exec { 'for file in ifcfg-eth*; do grep -q -F "PEERDNS=" $file || echo "PEERDNS=no" >> $file; done ': + provider => 'shell', + cwd => '/etc/sysconfig/network-scripts', + } + } } } } } - - |