openstack/barbican
Code Issues Proposed changes

Merge "Change naming convention for Barbican config files"

Browse Source
This commit is contained in:
Jenkins 2015-06-24 22:42:15 +00:00 committed by Gerrit Code Review
commit 6eb6872e5f
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/barbican-all
View File

@ -14,7 +14,7 @@ VENV_HOME=${VENV_HOME:-$PWD}
VENV_PYTHON=$VENV_HOME/$VENV/lib/python2.7/site-packages VENV_PYTHON=$VENV_HOME/$VENV/lib/python2.7/site-packages
PKG_DIR=/etc/$PKG PKG_DIR=/etc/$PKG
CONF_FILE=$PKG_DIR/barbican-api.conf CONF_FILE=$PKG_DIR/barbican.conf
POLICY_FILE=$PKG_DIR/policy.json POLICY_FILE=$PKG_DIR/policy.json
SIGNING_DIR=$PKG_DIR/cache/ SIGNING_DIR=$PKG_DIR/cache/
OPTS='--daemonize /var/log/barbican/uwsgi.log' OPTS='--daemonize /var/log/barbican/uwsgi.log'
@ -25,15 +25,15 @@ then
echo 'Running locally...' echo 'Running locally...'
PKG_DIR=$PWD/etc/$PKG PKG_DIR=$PWD/etc/$PKG
CONF_FILE=./etc/$PKG/barbican-api.conf CONF_FILE=./etc/$PKG/barbican.conf
PYTHONPATH=$VENV_PYTHON:$PYTHONPATH PYTHONPATH=$VENV_PYTHON:$PYTHONPATH
OPTS='-H '$VENV_HOME/$VENV' --stats :9314' OPTS='-H '$VENV_HOME/$VENV' --stats :9314'
# Copy conf file to home directory so oslo.config can find it # Copy conf file to home directory so oslo.config can find it
LOCAL_CONF_FILE=~/barbican-api.conf LOCAL_CONF_FILE=~/barbican.conf
if [ ! -f $LOCAL_CONF_FILE ]; if [ ! -f $LOCAL_CONF_FILE ];
then then
cp ./etc/$PKG/barbican-api.conf ~ cp ./etc/$PKG/barbican.conf ~
fi fi
fi fi

2
bin/barbican.sh
View File

@ -12,7 +12,7 @@ if [ ! -d $LOCAL_CONFIG_DIR ];
then then
LOCAL_CONFIG_DIR=../etc/barbican LOCAL_CONFIG_DIR=../etc/barbican
fi fi
LOCAL_CONFIG=$LOCAL_CONFIG_DIR/barbican-api.conf LOCAL_CONFIG=$LOCAL_CONFIG_DIR/barbican.conf
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo 'DIR: '$DIR echo 'DIR: '$DIR

4
contrib/devstack/lib/barbican
View File

@ -32,7 +32,7 @@ set +o xtrace
BARBICAN_DIR=$DEST/barbican BARBICAN_DIR=$DEST/barbican
BARBICANCLIENT_DIR=$DEST/python-barbicanclient BARBICANCLIENT_DIR=$DEST/python-barbicanclient
BARBICAN_CONF_DIR=${BARBICAN_CONF_DIR:-/etc/barbican} BARBICAN_CONF_DIR=${BARBICAN_CONF_DIR:-/etc/barbican}
BARBICAN_CONF=$BARBICAN_CONF_DIR/barbican-api.conf BARBICAN_CONF=$BARBICAN_CONF_DIR/barbican.conf
BARBICAN_PASTE_CONF=$BARBICAN_CONF_DIR/barbican-api-paste.ini BARBICAN_PASTE_CONF=$BARBICAN_CONF_DIR/barbican-api-paste.ini
BARBICAN_API_LOG_DIR=$DEST/logs BARBICAN_API_LOG_DIR=$DEST/logs
BARBICAN_AUTH_CACHE_DIR=${BARBICAN_AUTH_CACHE_DIR:-/var/cache/barbican} BARBICAN_AUTH_CACHE_DIR=${BARBICAN_AUTH_CACHE_DIR:-/var/cache/barbican}
@ -89,7 +89,7 @@ function configure_barbican {
sudo chown $USER $BARBICAN_CONF_DIR sudo chown $USER $BARBICAN_CONF_DIR
# Copy the barbican config files to the config dir # Copy the barbican config files to the config dir
cp $BARBICAN_DIR/etc/barbican/barbican-api.conf $BARBICAN_CONF_DIR cp $BARBICAN_DIR/etc/barbican/barbican.conf $BARBICAN_CONF_DIR
cp $BARBICAN_DIR/etc/barbican/barbican-api-paste.ini $BARBICAN_CONF_DIR cp $BARBICAN_DIR/etc/barbican/barbican-api-paste.ini $BARBICAN_CONF_DIR
cp -R $BARBICAN_DIR/etc/barbican/vassals $BARBICAN_CONF_DIR cp -R $BARBICAN_DIR/etc/barbican/vassals $BARBICAN_CONF_DIR

4
doc/source/contribute/database_migrations.rst
View File

@ -178,7 +178,7 @@ application per the 'Via Application' section.
Thereafter, it is suggested that only the ``barbican-db-manage.py`` script Thereafter, it is suggested that only the ``barbican-db-manage.py`` script
above be used to update the database schema per the 'Manually' section. Also, above be used to update the database schema per the 'Manually' section. Also,
automatic database updates from the Barbican application should be disabled by automatic database updates from the Barbican application should be disabled by
adding/updating ``db_auto_create = False`` in the ``barbican-api.conf`` adding/updating ``db_auto_create = False`` in the ``barbican.conf``
configuration file. configuration file.
Via Application Via Application
@ -196,7 +196,7 @@ version, or else it can update an existing database table space to the latest
schema revision (called ``head`` in the docs). schema revision (called ``head`` in the docs).
*To bypass this automatic behavior, add* ``db_auto_create = False`` *to the* *To bypass this automatic behavior, add* ``db_auto_create = False`` *to the*
``barbican-api.conf`` *file*. ``barbican.conf`` *file*.
Manually Manually
''''''''' '''''''''

2
doc/source/setup/certificate.rst
View File

@ -9,7 +9,7 @@ certificate plugin. This is not suitable for production environment, but it can
be useful as a development tool. be useful as a development tool.
To do so, you simply need to set ``enabled_certificate_plugins`` in To do so, you simply need to set ``enabled_certificate_plugins`` in
``barbican-api.conf``. ``barbican.conf``.
.. code-block:: text .. code-block:: text

4
doc/source/setup/troubleshooting.rst
View File

@ -79,7 +79,7 @@ endpoint's host name (typically the load balancer's DNS name and port).
How to avoid How to avoid
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
Change your ``barbican-api.conf`` file's ``host_href`` setting from Change your ``barbican.conf`` file's ``host_href`` setting from
``localhost:9311`` to the correct host name (myhostname.com in the example ``localhost:9311`` to the correct host name (myhostname.com in the example
above). above).
@ -159,7 +159,7 @@ The vassal (worker) processes are not able to access the datastore.
How to avoid How to avoid
^^^^^^^^^^^^ ^^^^^^^^^^^^
Check the ``sql_connection`` in your ``barbican-api.conf`` file, to make sure Check the ``sql_connection`` in your ``barbican.conf`` file, to make sure
that it references a valid reachable database. that it references a valid reachable database.

0
etc/barbican/barbican-api.conf → etc/barbican/barbican.conf
View File

0
etc/init/barbican-api.conf → etc/init/barbican.conf
View File

4
rpmbuild/SPECS/barbican.spec
View File

@ -41,7 +41,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init
mkdir -p $RPM_BUILD_ROOT/etc/barbican/vassals mkdir -p $RPM_BUILD_ROOT/etc/barbican/vassals
mkdir -p $RPM_BUILD_ROOT/var/l{ib,og}/barbican mkdir -p $RPM_BUILD_ROOT/var/l{ib,og}/barbican
install -m 644 etc/barbican/policy.json $RPM_BUILD_ROOT/etc/barbican install -m 644 etc/barbican/policy.json $RPM_BUILD_ROOT/etc/barbican
install -m 644 etc/init/barbican-api.conf $RPM_BUILD_ROOT/etc/init install -m 644 etc/init/barbican.conf $RPM_BUILD_ROOT/etc/init
install -m 644 etc/init/barbican-worker.conf $RPM_BUILD_ROOT/etc/init install -m 644 etc/init/barbican-worker.conf $RPM_BUILD_ROOT/etc/init
install -m 644 etc/init/barbican-keystone-listener.conf $RPM_BUILD_ROOT/etc/init install -m 644 etc/init/barbican-keystone-listener.conf $RPM_BUILD_ROOT/etc/init
install bin/barbican-worker.py $RPM_BUILD_ROOT/usr/bin install bin/barbican-worker.py $RPM_BUILD_ROOT/usr/bin
@ -88,7 +88,7 @@ Barbican Key Manager API daemon
/etc/logrotate.d/barbican-api /etc/logrotate.d/barbican-api
%attr(0755,root,root) /usr/bin/barbican.sh %attr(0755,root,root) /usr/bin/barbican.sh
%attr(0755,root,root) /usr/bin/barbican-db-manage.py %attr(0755,root,root) /usr/bin/barbican-db-manage.py
%config(noreplace) /etc/init/barbican-api.conf %config(noreplace) /etc/init/barbican.conf
%config(noreplace) /etc/barbican/* %config(noreplace) /etc/barbican/*
%preun -n barbican-api %preun -n barbican-api