openstack/barbican
Code Issues Proposed changes

Set host_href parameter in devstack

Browse Source 
`host_href` is used for HATEOS-style references. Currently this
value is set to `http://localhost:9311` and fixed. But sometimes
this value is inconvenient.
This patch fixes it to be able to configure.

Change-Id: I1940139375d9c036e40c93fb1b18fe127e2a7e7f
This commit is contained in:
OTSUKA, Yuanying
2015-08-28 13:51:31 +09:00
parent d7331c7db6
commit d73bcec500
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/devstack/lib/barbican
View File

@@ -51,6 +51,8 @@ BARBICANCLIENT_BRANCH=${BARBICANCLIENT_BRANCH:-master}
# Tell Tempest this project is present # Tell Tempest this project is present
TEMPEST_SERVICES+=,barbican TEMPEST_SERVICES+=,barbican
# Set host href
BARBICAN_HOST_HREF=${BARBICAN_HOST_HREF:-http://${SERVICE_HOST}:9311}
# Functions # Functions
# --------- # ---------
@@ -127,6 +129,9 @@ function configure_barbican {
# Do not set to DEBUG # Do not set to DEBUG
iniset $BARBICAN_CONF DEFAULT debug False iniset $BARBICAN_CONF DEFAULT debug False
# Set the host_href
iniset $BARBICAN_CONF DEFAULT host_href "$BARBICAN_HOST_HREF"
# Set the log file location # Set the log file location
iniset $BARBICAN_CONF DEFAULT log_file "$BARBICAN_API_LOG_DIR/barbican.log" iniset $BARBICAN_CONF DEFAULT log_file "$BARBICAN_API_LOG_DIR/barbican.log"

4
devstack/lib/barbican
View File

@@ -101,6 +101,9 @@ function configure_barbican {
# Do not set to DEBUG # Do not set to DEBUG
iniset $BARBICAN_CONF DEFAULT debug False iniset $BARBICAN_CONF DEFAULT debug False
# Set the host_href
iniset $BARBICAN_CONF DEFAULT host_href "$BARBICAN_HOST_HREF"
# Set the log file location # Set the log file location
iniset $BARBICAN_CONF DEFAULT log_file "$BARBICAN_API_LOG_DIR/barbican.log" iniset $BARBICAN_CONF DEFAULT log_file "$BARBICAN_API_LOG_DIR/barbican.log"
@@ -491,4 +494,3 @@ function install_dogtag_components {
# Restore xtrace # Restore xtrace
$XTRACE $XTRACE

3
devstack/settings
View File

@@ -21,6 +21,9 @@ BARBICAN_BRANCH=${BARBICAN_BRANCH:-master}
BARBICANCLIENT_REPO=${BARBICANCLIENT_REPO:-${GIT_BASE}/openstack/python-barbicanclient.git} BARBICANCLIENT_REPO=${BARBICANCLIENT_REPO:-${GIT_BASE}/openstack/python-barbicanclient.git}
BARBICANCLIENT_BRANCH=${BARBICANCLIENT_BRANCH:-master} BARBICANCLIENT_BRANCH=${BARBICANCLIENT_BRANCH:-master}
# Set host href
BARBICAN_HOST_HREF=${BARBICAN_HOST_HREF:-http://${SERVICE_HOST}:9311}
# Tell Tempest this project is present # Tell Tempest this project is present
TEMPEST_SERVICES+=,barbican TEMPEST_SERVICES+=,barbican