From 41d01104b16bf5d0d6d4d7d2a1e5883d34bff810 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 3 Dec 2015 08:12:23 -0500 Subject: [PATCH] remove generic extras.d support This removes the generic extras.d support, which we said we'd do at Mitaka-1. In tree extras.d continues to function as before, though we need stories to get ceph and ironic into plugins, and a better solution for Tempest. Change-Id: I8b134446dc08a2c3852423ca71af2f469f85496e --- functions-common | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/functions-common b/functions-common index d68ae77971..91a148603b 100644 --- a/functions-common +++ b/functions-common @@ -1741,17 +1741,18 @@ function run_phase { if [[ -d $TOP_DIR/extras.d ]]; then local extra_plugin_file_name for extra_plugin_file_name in $TOP_DIR/extras.d/*.sh; do - [[ -r $extra_plugin_file_name ]] && source $extra_plugin_file_name $mode $phase - # NOTE(sdague): generate a big warning about using - # extras.d in an unsupported way which will let us track - # unsupported usage in the gate. + # NOTE(sdague): only process extras.d for the 3 explicitly + # white listed elements in tree. We want these to move out + # over time as well, but they are in tree, so we need to + # manage that. local exceptions="50-ironic.sh 60-ceph.sh 80-tempest.sh" local extra extra=$(basename $extra_plugin_file_name) if [[ ! ( $exceptions =~ "$extra" ) ]]; then - deprecated "extras.d support is being removed in Mitaka-1" - deprecated "jobs for project $extra will break after that point" - deprecated "please move project to a supported devstack plugin model" + warn "use of extras.d is no longer supported" + warn "processing of project $extra is skipped" + else + [[ -r $extra_plugin_file_name ]] && source $extra_plugin_file_name $mode $phase fi done fi