openstack/fuel-library
Code Issues Proposed changes

Minor fixes

Browse Source
This commit is contained in:
vic 2012-11-12 18:04:12 +04:00
parent 1db547295a
commit 1e47ef0cc8
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack/manifests/repo/yum.pp
View File

@ -7,8 +7,6 @@ class openstack::repo::yum (
$gpgcheck = 1, $gpgcheck = 1,
$mirrorlist = absent, $mirrorlist = absent,
$rhel_location = undef, $rhel_location = undef,
$mirrorlist = absent,
$rhel_location = undef,
) )
{ {

12
deployment/puppet/selinux/manifests/config.pp
View File

@ -38,10 +38,18 @@ class selinux::config(
$sestatus = '0' $sestatus = '0'
# workaround bugfix (http://projects.puppetlabs.com/issues/4466) # workaround bugfix (http://projects.puppetlabs.com/issues/4466)
case $::osfamily {
'RedHat': {
$facter_selinux_path = '/usr/lib/ruby/site_ruby/1.8/facter/selinux.rb' $facter_selinux_path = '/usr/lib/ruby/site_ruby/1.8/facter/selinux.rb'
}
'Debian': {
$facter_selinux_path = '/usr/lib/ruby/vendor_ruby/facter/selinux.rb'
}
}
exec { "patch-facter-selinux": exec { "patch-facter-selinux":
command => "sed -i 's|proc/self/attr/current\") !|proc/self/attr/current\") rescue \"kernel\\\0\" !|' ${facter_selinux_path}", command => "sed -i 's|proc/self/attr/current\") !|proc/self/attr/current\") rescue \"kernel\\\\0\" !|' ${facter_selinux_path}",
unless => "grep -q 'rescue \"kernel\\\0' ${facter_selinux_path}", unless => "grep -q 'rescue \"kernel' ${facter_selinux_path}",
} }
if $mode == 'disabled' and $::selinux_current_mode == 'permissive' { if $mode == 'disabled' and $::selinux_current_mode == 'permissive' {

1
deployment/puppet/swift/examples/all.pp
View File

@ -38,7 +38,6 @@ swift::storage::loopback { '2':
swift::storage::node { '2': swift::storage::node { '2':
mnt_base_dir => '/srv/node', mnt_base_dir => '/srv/node',
weight => 1,
manage_ring => true, manage_ring => true,
zone => '2', zone => '2',
storage_local_net_ip => $swift_local_net_ip, storage_local_net_ip => $swift_local_net_ip,

4
deployment/puppet/swift/examples/site.pp
View File

@ -97,8 +97,8 @@ node keystone {
# we are binding keystone on all interfaces # we are binding keystone on all interfaces
# the end user may want to be more restrictive # the end user may want to be more restrictive
bind_host => '0.0.0.0', bind_host => '0.0.0.0',
log_verbose => $verbose, verbose => $verbose,
log_debug => $verbose, debug => $verbose,
catalog_type => 'sql', catalog_type => 'sql',
} }