Merge "Config docker registry in devstack"

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 {