openstack
/
magnum
Code Issues Proposed changes

Merge "Enable barbican cert manager in devstack"

This commit is contained in:
Jenkins 2015-09-24 03:43:18 +00:00 committed by Gerrit Code Review
parent 2b0d027731 d79b73144e
commit c6e0a88b8e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/magnum
View File

@ -186,8 +186,12 @@ function create_magnum_conf {
sudo mkdir -p $MAGNUM_LOCAL_CERT_DIR
sudo chown $STACK_USER $MAGNUM_LOCAL_CERT_DIR
fi
iniset $MAGNUM_CONF certificates storage_path "$MAGNUM_LOCAL_CERT_DIR"
iniset $MAGNUM_CONF certificates cert_manager_type "local"
if is_service_enabled barbican; then
iniset $MAGNUM_CONF certificates cert_manager_type "barbican"
else
iniset $MAGNUM_CONF certificates storage_path "$MAGNUM_LOCAL_CERT_DIR"
iniset $MAGNUM_CONF certificates cert_manager_type "local"
fi
}
function update_heat_policy {