Browse code

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

Sean Dague authored on 2015/12/03 22:12:23
Showing 1 changed files
... ...
@@ -1741,17 +1741,18 @@ function run_phase {
1741 1741
     if [[ -d $TOP_DIR/extras.d ]]; then
1742 1742
         local extra_plugin_file_name
1743 1743
         for extra_plugin_file_name in $TOP_DIR/extras.d/*.sh; do
1744
-            [[ -r $extra_plugin_file_name ]] && source $extra_plugin_file_name $mode $phase
1745
-            # NOTE(sdague): generate a big warning about using
1746
-            # extras.d in an unsupported way which will let us track
1747
-            # unsupported usage in the gate.
1744
+            # NOTE(sdague): only process extras.d for the 3 explicitly
1745
+            # white listed elements in tree. We want these to move out
1746
+            # over time as well, but they are in tree, so we need to
1747
+            # manage that.
1748 1748
             local exceptions="50-ironic.sh 60-ceph.sh 80-tempest.sh"
1749 1749
             local extra
1750 1750
             extra=$(basename $extra_plugin_file_name)
1751 1751
             if [[ ! ( $exceptions =~ "$extra" ) ]]; then
1752
-                deprecated "extras.d support is being removed in Mitaka-1"
1753
-                deprecated "jobs for project $extra will break after that point"
1754
-                deprecated "please move project to a supported devstack plugin model"
1752
+                warn "use of extras.d is no longer supported"
1753
+                warn "processing of project $extra is skipped"
1754
+            else
1755
+                [[ -r $extra_plugin_file_name ]] && source $extra_plugin_file_name $mode $phase
1755 1756
             fi
1756 1757
         done
1757 1758
     fi