commit 4df0ec39741ca44614565d6b37dbcc87ec1325f7
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Nov 07 09:30:54 2018 +0000
committer Gerrit Code Review <mail@domain.com> Wed Nov 07 09:30:54 2018 +0000
tree 7aa62bd9dafb7d9b21597bc3f7dc51ab5937cdca
parent 551002050ad5d6f2d89dddc0a5f94b380b0e8d3a
parent 0e5c105f7cbe4a086d9aeb6d8d054367955ad645

Merge "Add ability to define horizon images upload mode"

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index e6dd320..284672a 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -39,3 +39,6 @@
     # Apache mods defaults
     apache_mods_status_enabled: True
     apache_mods_status_status: 'disabled'
+    # Horizon
+    # 'direct' mode will require cors on glance side to be enabled.
+    horizon_images_upload_mode: 'legacy'

horizon/server/cluster.yml

diff --git a/horizon/server/cluster.yml b/horizon/server/cluster.yml
index 1d1f5eb..0cd20d7 100644
--- a/horizon/server/cluster.yml
+++ b/horizon/server/cluster.yml
@@ -16,6 +16,7 @@
       plugin: {}
       session:
         engine: "cache"
+      images_upload_mode: ${_param:horizon_images_upload_mode}
   apache:
     server:
       modules:

horizon/server/single.yml

diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index 2555a50..bd2ea7b 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -14,6 +14,7 @@
       plugin: {}
       session:
         engine: "cache"
+      images_upload_mode: ${_param:horizon_images_upload_mode}
   apache:
     server:
       modules: