ea7018fe5f
This syncs Keystone with oslo-incubator commit hash 2fd457bf2ccbeb2b84ffb204778b6417cd5405ba . In keystone: $ rm -r keystone/openstack/common In oslo-incubator: $ python update.py ../keystone The newer lockutils requires posix_ipc. It's already in global-requirements. Keystone uses gettextutils and versionutils from oslo-incubator so those should be in openstack-common.conf. They were pulled in as dependencies of other oslo-incubator modules but Keystone shouldn't rely on that. Keystone doesn't use log_handler directly so that module was removed from openstack-common.conf. log_handler is available in the oslo.messaging library. Change-Id: I6082f4e0995ca35372f9b061d8f76890aa93250c
26 lines
688 B
Bash
Executable File
26 lines
688 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 ! 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
|