Remove trailing whitespaces in regular file

Change-Id: I06d4ed2a8153820f7253c6602bfa8c05af59e06f
This commit is contained in:
Hengqing Hu 2012-03-09 15:59:44 +08:00
parent 5cd947a18c
commit dcd994da28
7 changed files with 16 additions and 16 deletions

View File

@ -13,7 +13,7 @@ class openstack_base {
class { 'iptables':
public_tcp_ports => $iptables_public_tcp_ports,
}
file { '/etc/profile.d/Z98-byobu.sh':
ensure => 'absent'
}
@ -167,7 +167,7 @@ node "gerrit.openstack.org" {
node "gerrit-dev.openstack.org" {
$iptables_public_tcp_ports = [80, 443, 29418]
include openstack_server
class { 'gerrit':
canonicalweburl => "https://review-dev.openstack.org/",
email => "review-dev@openstack.org",
@ -223,7 +223,7 @@ node "planet.openstack.org" {
$iptables_public_tcp_ports = [80]
include openstack_server
include planet
planet::site { "openstack":
git_url => "https://github.com/openstack/openstack-planet.git"
}

View File

@ -16,7 +16,7 @@ $commentlinks = [ { name => 'changeid',
]
) {
package { "gitweb":
ensure => latest
}
@ -32,7 +32,7 @@ $commentlinks = [ { name => 'changeid',
provider => pip,
require => Package[python-pip]
}
if $gerrit_installed {
#notice('Gerrit is installed')
@ -59,7 +59,7 @@ $commentlinks = [ { name => 'changeid',
hour => 6,
minute => 3,
command => 'cd /home/gerrit2/openstack-ci && python gerrit/expire_old_reviews.py'
}
}
cron { "gerrit_repack":
user => gerrit2,
@ -128,7 +128,7 @@ $commentlinks = [ { name => 'changeid',
source => 'puppet:///modules/gerrit/echosign-cla.html',
replace => 'true',
}
} else {
notice('Gerrit is not installed')
}

View File

@ -15,11 +15,11 @@ class iptables($rules='', $public_tcp_ports=[], $public_udp_ports=[]) {
# iptables is part of the kernel.)
hasstatus => true,
status => "true",
# Under Debian, the "restart" parameter does not reload the rules, so tell
# Puppet to fall back to stop/start, which does work.
hasrestart => false,
}
file { "/etc/iptables":
@ -33,7 +33,7 @@ class iptables($rules='', $public_tcp_ports=[], $public_udp_ports=[]) {
mode => 640,
content => template('iptables/rules.erb'),
require => [Package["iptables-persistent"], File["/etc/iptables"]],
# When this file is updated, make sure the rules get reloaded.
notify => Service["iptables-persistent"],
;

View File

@ -1,11 +1,11 @@
# Orchestra - Ubuntu Server Installation
# * Minimal install
# * Minimal install
# * Cloud-init for bare-metal
# * Grab meta-data and user-data from cobbler server in a late command
# d-i debian-installer/add-kernel-opts string --verbose
# Locale
# Locale
d-i debian-installer/locale string en_US.UTF-8
# No splash
@ -73,7 +73,7 @@ d-i passwd/make-user boolean true
d-i passwd/user-fullname string ubuntu
d-i passwd/username string ubuntu
d-i passwd/user-password-crypted password $6$.1eHH0iY$ArGzKX2YeQ3G6U.mlOO3A.NaL22Ewgz8Fi4qqz.Ns7EMKjEJRIW2Pm/TikDptZpuu7I92frytmk5YeL.9fRY4.
d-i passwd/user-uid string
d-i passwd/user-uid string
d-i user-setup/allow-password-weak boolean false
d-i user-setup/encrypt-home boolean false
d-i passwd/user-default-groups string adm cdrom dialout lpadmin plugdev sambashare

View File

@ -28,7 +28,7 @@ runcmd:
- sudo lvrename /dev/main/root orig_root
- sudo lvcreate -L20G -s -n root /dev/main/orig_root
- reboot
ssh_authorized_keys:
ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtioTW2wh3mBRuj+R0Jyb/mLt5sjJ8dEvYyA8zfur1dnqEt5uQNLacW4fHBDFWJoLHfhdfbvray5wWMAcIuGEiAA2WEH23YzgIbyArCSI+z7gB3SET8zgff25ukXlN+1mBSrKWxIza+tB3NU62WbtO6hmelwvSkZ3d7SDfHxrc4zEpmHDuMhxALl8e1idqYzNA+1EhZpbcaf720mX+KD3oszmY2lqD1OkKMquRSD0USXPGlH3HK11MTeCArKRHMgTdIlVeqvYH0v0Wd1w/8mbXgHxfGzMYS1Ej0fzzJ0PC5z5rOqsMqY1X2aC1KlHIFLAeSf4Cx0JNlSpYSrlZ/RoiQ== hudson@hudson
""" % http_server

View File

@ -139,7 +139,7 @@ load 12 10 5
# Event MIB - automatically generate alerts
#
# Remember to activate the 'createUser' lines above
#iquerySecName internalUser
#iquerySecName internalUser
#rouser internalUser
# generate traps on UCD error conditions
#defaultMonitors yes

View File

@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
# Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
# This initial version of this file was taken from the source tree
# of GlusterFS. It was not directly attributed, but is assumed to be
# Copyright (c) 2010-2011 Gluster, Inc and release GPLv3