Merge "Fix how disallow_iframe_embed is defined"

releasenotes/notes/bug-1942722-3cc45ac696688336.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixed wrong usage of the ``DISALLOW_IFRAME_EMBED`` option.

spec/classes/horizon_init_spec.rb

@@ -206,6 +206,7 @@ describe 'horizon' do
           'COMPRESS_OFFLINE = False',
           "FILE_UPLOAD_TEMP_DIR = '/var/spool/horizon'",
           "OVERVIEW_DAYS_RANGE = 1",
+          'DISALLOW_IFRAME_EMBED = True',
         ])
       end
 
@@ -557,16 +558,16 @@ describe 'horizon' do
       end
     end
 
-    context 'with disallow iframe embed enabled' do
+    context 'with disallow iframe embed disabled' do
       before do
         params.merge!({
-                        :disallow_iframe_embed => true
+                        :disallow_iframe_embed => false
                       })
       end
 
       it 'disallow_iframe_embed is configured' do
         verify_concat_fragment_contents(catalogue, 'local_settings.py', [
-                                          'HORIZON_CONFIG["disallow_iframe_embed"] = True',
+                                          'DISALLOW_IFRAME_EMBED = False',
                                         ])
       end
     end

templates/local_settings.py.erb

@@ -1036,9 +1036,7 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES',
 # For more information see:
 # http://tinyurl.com/anticlickjack
 #DISALLOW_IFRAME_EMBED = True
-<% if @disallow_iframe_embed == true %>
-HORIZON_CONFIG["disallow_iframe_embed"] = True
-<% end %>
+DISALLOW_IFRAME_EMBED = <%= @disallow_iframe_embed.to_s.capitalize %>
 
 <% if @horizon_upload_mode %>
 HORIZON_IMAGES_UPLOAD_MODE = <%= @horizon_upload_mode %>