From d2676a2d635d18e6f9c7aff22ae9c1cdb3a84241 Mon Sep 17 00:00:00 2001 From: Hua Wang Date: Wed, 6 Apr 2016 15:19:17 +0800 Subject: [PATCH] Config docker registry in devstack Config docker registry in devstack Change-Id: I7964c3b4f35747418dbe84d1ac003c462b2ea907 Partially-Implements: blueprint registryv2-in-master --- devstack/lib/magnum | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index 620cd4d344..1ca1cd7d22 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -58,6 +58,8 @@ MAGNUM_SERVICE_PROTOCOL=${MAGNUM_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} MAGNUM_TRUSTEE_DOMAIN_ADMIN_PASSWORD=${MAGNUM_TRUSTEE_DOMAIN_ADMIN_PASSWORD:-secret} +MAGNUM_SWIFT_REGISTRY_CONTAINER=${MAGNUM_SWIFT_REGISTRY_CONTAINER:-docker_registry} + # Support entry points installation of console scripts if [[ -d $MAGNUM_DIR/bin ]]; then MAGNUM_BIN_DIR=$MAGNUM_DIR/bin @@ -218,6 +220,11 @@ function create_magnum_conf { iniset $MAGNUM_CONF trust trustee_domain_admin_id $trustee_domain_admin_id iniset $MAGNUM_CONF trust trustee_domain_admin_password $MAGNUM_TRUSTEE_DOMAIN_ADMIN_PASSWORD iniset $MAGNUM_CONF cinder_client region_name $REGION_NAME + + if is_service_enabled swift; then + iniset $MAGNUM_CONF docker_registry swift_region $REGION_NAME + iniset $MAGNUM_CONF docker_registry swift_registry_container $MAGNUM_SWIFT_REGISTRY_CONTAINER + fi } function create_api_paste_conf {