Browse code

Merge "lib/neutron: Add neutron_deploy_rootwrap_filters"

Jenkins authored on 2017/09/04 13:34:59
Showing 1 changed files
... ...
@@ -493,6 +493,13 @@ function neutron_server_config_add_new {
493 493
     _NEUTRON_SERVER_EXTRA_CONF_FILES_ABS+=($1)
494 494
 }
495 495
 
496
+# neutron_deploy_rootwrap_filters() - deploy rootwrap filters
497
+function neutron_deploy_rootwrap_filters_new {
498
+    local srcdir=$1
499
+    sudo install -d -o root -g root -m 755 $NEUTRON_CONF_DIR/rootwrap.d
500
+    sudo install -o root -g root -m 644 $srcdir/etc/neutron/rootwrap.d/*.filters $NEUTRON_CONF_DIR/rootwrap.d
501
+}
502
+
496 503
 # Dispatch functions
497 504
 # These are needed for compatibility between the old and new implementations
498 505
 # where there are function name overlaps.  These will be removed when
... ...
@@ -607,5 +614,14 @@ function stop_neutron {
607 607
     fi
608 608
 }
609 609
 
610
+function neutron_deploy_rootwrap_filters {
611
+    if is_neutron_legacy_enabled; then
612
+        # Call back to old function
613
+        _neutron_deploy_rootwrap_filters "$@"
614
+    else
615
+        neutron_deploy_rootwrap_filters_new "$@"
616
+    fi
617
+}
618
+
610 619
 # Restore xtrace
611 620
 $XTRACE