Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 368128 Details for
Bug 498510
sys-auth/keystone-2013.2.9999.ebuild: fix QA notice; init script cleanup
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
QA notice adn init script patch
keystone-2013.2.9999.patch (text/plain), 3.05 KB, created by
Vadim Kuznetsov (RETIRED)
on 2014-01-19 01:34:47 UTC
(
hide
)
Description:
QA notice adn init script patch
Filename:
MIME Type:
Creator:
Vadim Kuznetsov (RETIRED)
Created:
2014-01-19 01:34:47 UTC
Size:
3.05 KB
patch
obsolete
>diff --git a/files/keystone.confd b/files/keystone.confd >index 670ec22..669fa0a 100644 >--- a/files/keystone.confd >+++ b/files/keystone.confd >@@ -1,3 +1,3 @@ >-CONFIG_FILE=/etc/keystone/keystone.conf >-LOG_FILE=/var/log/keystone/keystone.log >-PID_PATH=/var/run/keystone >+#KEYSTONE_CONF=/etc/keystone/keystone.conf >+#KEYSTONE_USER=keystone >+KEYSTONE_ARGS="--logfile /var/log/keystone/keystone.log" >diff --git a/files/keystone.initd b/files/keystone.initd >index f7c4acd..78dd4ac 100644 >--- a/files/keystone.initd >+++ b/files/keystone.initd >@@ -1,56 +1,16 @@ > #!/sbin/runscript >-# Copyright 1999-2013 Gentoo Foundation >+# Copyright 1999-2014 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v 1.3 2013/11/18 03:24:30 prometheanfire Exp $ >+# $Header: $ >+ >+command=/usr/bin/keystone-all >+command_args="${KEYSTONE_ARGS}" >+pidfile=/var/run/keystone.pid >+name="OpenStack Keystone" >+description="Starts both the service and administrative APIs in a single process to provide catalog, authorization, and authentication services for OpenStack" >+start_stop_daemon_args="--background --make-pidfile --user ${KEYSTONE_USER:-keystone}" >+required_files="${KEYSTONE_CONF:-/etc/keystone/keystone.conf}" > > depend() { > need net > } >- >-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1) >- >-checkconfig() { >- if [ ! -r /etc/conf.d/$BASENAME ]; then >- eerror "No keystone service confd file found: /etc/conf.d/$BASENAME)" >- return 1 >- fi >- . /etc/conf.d/$BASENAME >- >- if [ ! -r ${CONFIG_FILE} ]; then >- eerror "No keystone config file found: ${CONFIG_FILE})" >- return 1 >- fi >- >- return 0 >-} >- >- >-start() { >- checkconfig || return $? >- . /etc/conf.d/$BASENAME >- >- if [ ! -d ${PID_PATH} ]; then >- mkdir ${PID_PATH} >- fi >- >- ebegin "Starting ${SVCNAME}" >- >- start-stop-daemon --start --quiet --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE} --log-file=${LOG_FILE} >- >- eend $? "Failed to start ${SVCNAME}" >-} >- >-stop() { >- checkconfig || return $? >- . /etc/conf.d/$BASENAME >- >- ebegin "Stopping ${SVCNAME}" >- >- start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \ >- --exec /usr/bin/${SVCNAME}-all >- eend $? "Failed to stop ${SVCNAME}" >-} >- >-#restart() { >-# >-#} >diff --git a/keystone-2013.2.9999.ebuild b/keystone-2013.2.9999.ebuild >index c2cd99a..ec78000 100644 >--- a/keystone-2013.2.9999.ebuild >+++ b/keystone-2013.2.9999.ebuild >@@ -100,14 +100,13 @@ python_install() { > newinitd "${FILESDIR}/keystone.initd" keystone > > diropts -m 0750 >- dodir /var/run/keystone /var/log/keystone /etc/keystone >- keepdir /etc/keystone >+ keepdir /etc/keystone /var/log/keystone > insinto /etc/keystone > doins etc/keystone.conf.sample etc/logging.conf.sample > doins etc/default_catalog.templates etc/policy.json > doins etc/policy.v3cloudsample.json etc/keystone-paste.ini > >- fowners keystone:keystone /var/run/keystone /var/log/keystone /etc/keystone >+ fowners keystone:keystone /etc/keystone /var/log/keystone > } > > pkg_postinst() {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 498510
: 368128