ef2040dae8
This syncs Keystone with oslo-incubator commit hash e9bb0b596650540f336afb070a1f8c7de099721f . In keystone: $ rm -r keystone/openstack/common In oslo-incubator: $ git checkout e9bb0b596650540f336afb070a1f8c7de099721f $ python update.py ../keystone Commits ------- bc48099 Log the function name of looping call 109e325 Use oslo.messaging to publish log errors de4adbc pep8: fixed multiple violations 9651085 generator: remove unused param, small clean up eac71f5 Fix common.log.ContextFormatter for Python 3 238e601 Make policy debug logging less verbose 250cd88 Fixed a new pep8 error and a small typo 5e3d3a5 Mask passwords included without quotes at the ends of commands e7c8a45 Improve error handling for conf sample generation 9e88af1 fixed typos found by RETF rules 5f12bba Implement stop method in ProcessLauncher 0d7296f Add kwargs to jsonutils.load(s) functions 9c88dc3 file_open: fixed docstring to refer to open() instead of file() d78b633 Fixes a simple spelling mistake 621d831 always log a traceback in the sys.excepthook Change-Id: I4ef56ce08e1f3bbc0ddb82a495da153e09a14c50
30 lines
722 B
Bash
Executable File
30 lines
722 B
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
PROJECT_NAME=${PROJECT_NAME:-keystone}
|
|
CFGFILE_NAME=${PROJECT_NAME}.conf.sample
|
|
|
|
if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then
|
|
CFGFILE=etc/${PROJECT_NAME}/${CFGFILE_NAME}
|
|
elif [ -e etc/${CFGFILE_NAME} ]; then
|
|
CFGFILE=etc/${CFGFILE_NAME}
|
|
else
|
|
echo "${0##*/}: can not find config file"
|
|
exit 1
|
|
fi
|
|
|
|
TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX`
|
|
trap "rm -rf $TEMPDIR" EXIT
|
|
|
|
tools/config/generate_sample.sh -b ./ -p ${PROJECT_NAME} -o ${TEMPDIR}
|
|
if [ $? != 0 ]
|
|
then
|
|
exit 1
|
|
fi
|
|
|
|
if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE}
|
|
then
|
|
echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date."
|
|
echo "${0##*/}: Please run ${0%%${0##*/}}generate_sample.sh."
|
|
exit 1
|
|
fi
|