From d79b73144e5f28893ac3c3da42085d3ecac67cc9 Mon Sep 17 00:00:00 2001 From: "OTSUKA, Yuanying" Date: Thu, 24 Sep 2015 09:50:42 +0900 Subject: [PATCH] Enable barbican cert manager in devstack If barbican service is enabled, this patch enable barbican cert manager to store certificate. Change-Id: I93c60abac6e1542204434465b60c488eafcd8746 Partially-Implements: blueprint barbican-support --- devstack/lib/magnum | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index 28aacc4d91..6724c25963 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -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 {