Browse code

Disable file injection by default

File injection in libvirt is problematic in havana on some systems.
When doing a live upgrade where the system suddenly gains libguestfs
support, a compute node may start using it, and thus start breaking.

Related master branch patch: I5015f2c351b1d680c205d7f9a5204febca490b91

Change-Id: Ic71baa25cda4b65c79c7c5f64bbb802774e489f4
Related-Bug: #1287354

Joe Gordon authored on 2014/03/07 09:44:10
Showing 1 changed files
... ...
@@ -22,6 +22,8 @@ set +o xtrace
22 22
 # Defaults
23 23
 # --------
24 24
 
25
+# File injection is disabled by default in Nova.  This will turn it back on.
26
+ENABLE_FILE_INJECTION=${ENABLE_FILE_INJECTION:-False}
25 27
 
26 28
 # Entry Points
27 29
 # ------------
... ...
@@ -114,6 +116,10 @@ EOF"
114 114
     if is_arch "ppc64"; then
115 115
         iniset $NOVA_CONF DEFAULT vnc_enabled "false"
116 116
     fi
117
+    if [[ "$ENABLE_FILE_INJECTION" = "False" ]] ; then
118
+        # Disable file injection by default
119
+        iniset $NOVA_CONF libvirt_inject_partition '-2'
120
+    fi
117 121
 }
118 122
 
119 123
 # install_nova_hypervisor() - Install external components