Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 240266 - app-admin/puppet-0.24.5-r1: Remove PUPPETMASTER_MANIFEST from startup scripts
Summary: app-admin/puppet-0.24.5-r1: Remove PUPPETMASTER_MANIFEST from startup scripts
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: MATSUU Takuto (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-10-06 13:25 UTC by Christian Kauhaus
Modified: 2008-10-06 16:29 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
/etc/init.d/puppetmaster patch (init.d_puppetmaster.patch,804 bytes, patch)
2008-10-06 13:26 UTC, Christian Kauhaus
Details | Diff
/etc/conf.d/puppetmaster patch (conf.d_puppetmaster.patch,447 bytes, patch)
2008-10-06 13:27 UTC, Christian Kauhaus
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Christian Kauhaus 2008-10-06 13:25:10 UTC
The Gentoo puppetmaster initscripts use PUPPETMASTER_MANIFEST, which overrides the manifest location at puppetmaster's startup via command line. Although this may present an easy guide for initial setup, it is conceptually incompatible with puppet environments.

With puppet environments, one can specify different manifests (and everything else) using separate sections in /etc/puppet/puppet.conf. This allows for example to distinguish development and production configurations. But when a --manifest command line argument is prenent during puppetmaster startup, the manifest is fixed to the parameter for all environments.

Therefor, I suggest to drop PUPPETMASTER_MANIFEST and --manifest from /etc/conf.d/puppetmaster and /etc/init.d/puppetmaster altogether.

Reproducible: Always




# emerge --info
Portage 2.1.4.4 (default/linux/amd64/2008.0, gcc-4.1.2, glibc-2.6.1-r0, 2.6.25-gentoo-r7 x86_64)
=================================================================
System uname: 2.6.25-gentoo-r7 x86_64 Intel(R) Xeon(R) CPU E5410 @ 2.33GHz
Timestamp of tree: Mon, 06 Oct 2008 01:15:01 +0000
ccache version 2.4 [enabled]
app-shells/bash:     3.2_p33
dev-lang/python:     2.4.4-r14, 2.5.2-r6
dev-python/pycrypto: 2.0.1-r6
dev-util/ccache:     2.4-r7
sys-apps/baselayout: 1.12.11.1
sys-apps/sandbox:    1.2.18.1-r2
sys-devel/autoconf:  2.61-r2
sys-devel/automake:  1.9.6-r2, 1.10.1
sys-devel/binutils:  2.18-r3
sys-devel/gcc-config: 1.4.0-r4
sys-devel/libtool:   1.5.26
virtual/os-headers:  2.6.23-r3
ACCEPT_KEYWORDS="amd64"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -march=nocona"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/revdep-rebuild /etc/terminfo /etc/udev/rules.d"
CXXFLAGS="-O2 -pipe -march=nocona"
DISTDIR="/usr/portage/distfiles"
FEATURES="buildpkg ccache distlocks metadata-transfer sandbox sfperms strict unmerge-orphans userfetch usersandbox"
GENTOO_MIRRORS="ftp://de-mirror.org/distro/gentoo ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/ "
LDFLAGS="-Wl,-O1"
MAKEOPTS="-j5"
PKGDIR="/usr/portage/packages"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
USE="acl acpi amd64 apache2 bash-completion berkdb bzip2 cli cracklib crypt cups device-mapper dri fortran gdbm gnutls gpm iconv ipv6 isdnlog jpeg kvm ldap logrotate midi mmx mudflap multilib ncurses nls nptl nptlonly openmp pam pcre perl png pppd python readline reflection session spl sqlite3 sse sse2 ssl symlink sysfs tcpd unicode vim-syntax xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" USERLAND="GNU" VIDEO_CARDS="fbdev glint i810 mach64 mga neomagic nv r128 radeon savage sis tdfx trident vesa vga via vmware voodoo"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, LC_ALL, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PORTDIR_OVERLAY
Comment 1 Christian Kauhaus 2008-10-06 13:26:44 UTC
Created attachment 167449 [details, diff]
/etc/init.d/puppetmaster patch
Comment 2 Christian Kauhaus 2008-10-06 13:27:10 UTC
Created attachment 167450 [details, diff]
/etc/conf.d/puppetmaster patch
Comment 3 MATSUU Takuto (RETIRED) gentoo-dev 2008-10-06 16:29:34 UTC
puppet-0.24.5-r4 in cvs.