opendev/system-config
Code Issues Proposed changes

Merge "Remove chattr"

Browse Source
This commit is contained in:
Jeremy Stanley 2014-04-28 16:27:59 +00:00 committed by Gerrit Code Review
commit 159bb69ce9
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openstack_project/files/nodepool/scripts/prepare_node.sh
View File

@ -67,7 +67,6 @@ set -e
set -o xtrace set -o xtrace
echo 'nameserver 127.0.0.1' > /etc/resolv.conf echo 'nameserver 127.0.0.1' > /etc/resolv.conf
chattr +i /etc/resolv.conf
exit 0 exit 0
EOF EOF

11
modules/unbound/manifests/init.pp
View File

@ -72,17 +72,6 @@ class unbound (
notify => Exec['make-resolv-conf-immutable'], notify => Exec['make-resolv-conf-immutable'],
} }
# Rackspace uses file injection to configure networking which
# overwrites all of the files on disk where we could set the env
# variable to disable the resolv.conf update on network-up.
# Instead, make that file immutable so that the update will fail
# (harmlessly). Of course this means Puppet won't be able to
# update it either after this, but we don't plan on changing it.
exec { 'make-resolv-conf-immutable':
command => '/usr/bin/chattr +i /etc/resolv.conf',
refreshonly => true,
}
service { 'unbound': service { 'unbound':
ensure => running, ensure => running,
name => 'unbound', name => 'unbound',