Merge "Add parameter description of HORIZON_IMAGES_UPLOAD_MODE"

templates/local_settings.py.erb

@@ -1033,6 +1033,11 @@ OVERVIEW_DAYS_RANGE = <%= @overview_days_range %>
 #DISALLOW_IFRAME_EMBED = True
 DISALLOW_IFRAME_EMBED = <%= @disallow_iframe_embed.to_s.capitalize %>
 
-<% if @horizon_upload_mode_real %>
+# Set to 'legacy' or 'direct' to allow users to upload images to glance via
+# Horizon server. When enabled, a file form field will appear on the create
+# image form. If set to 'off', there will be no file form field on the create
+# image form. See documentation for deployment considerations.
+#HORIZON_IMAGES_UPLOAD_MODE = 'legacy'
+<% if @horizon_upload_mode_real -%>
 HORIZON_IMAGES_UPLOAD_MODE = "<%= @horizon_upload_mode_real %>"
-<% end %>
+<%- end -%>