Fix section for secure_proxy_ssl_header

In Newton nova uses HTTPtoWSGI middleware
and secure_proxy_ssl_header is deprecated,
however in Mitaka secure_proxy_ssl_header is
still used, so its section is fixed by this commit.

Change-Id: Ic6ac9f61778f989ebbe5408b7e47176673ced427
Related-Bug: #1576740
Closes-Bug: #1588360

Author: mkarpin

manifests/api.pp

@@ -299,21 +299,21 @@
   }
 
   nova_config {
-    'DEFAULT/api_paste_config':                value => $api_paste_config;
-    'DEFAULT/enabled_apis':                    value => $enabled_apis_real;
-    'DEFAULT/volume_api_class':                value => $volume_api_class;
-    'DEFAULT/osapi_compute_listen':            value => $api_bind_address;
-    'DEFAULT/metadata_listen':                 value => $metadata_listen;
-    'DEFAULT/metadata_listen_port':            value => $metadata_listen_port;
-    'DEFAULT/osapi_compute_listen_port':       value => $osapi_compute_listen_port;
-    'DEFAULT/osapi_volume_listen':             value => $api_bind_address;
-    'DEFAULT/osapi_compute_workers':           value => $osapi_compute_workers;
-    'DEFAULT/metadata_workers':                value => $metadata_workers;
-    'DEFAULT/use_forwarded_for':               value => $use_forwarded_for;
-    'DEFAULT/default_floating_pool':           value => $default_floating_pool;
-    'DEFAULT/fping_path':                      value => $fping_path;
-    'osapi_v3/enabled':                        value => $osapi_v3;
-    'oslo_middleware/secure_proxy_ssl_header': value => $secure_proxy_ssl_header;
+    'DEFAULT/api_paste_config':          value => $api_paste_config;
+    'DEFAULT/enabled_apis':              value => $enabled_apis_real;
+    'DEFAULT/volume_api_class':          value => $volume_api_class;
+    'DEFAULT/osapi_compute_listen':      value => $api_bind_address;
+    'DEFAULT/metadata_listen':           value => $metadata_listen;
+    'DEFAULT/metadata_listen_port':      value => $metadata_listen_port;
+    'DEFAULT/osapi_compute_listen_port': value => $osapi_compute_listen_port;
+    'DEFAULT/osapi_volume_listen':       value => $api_bind_address;
+    'DEFAULT/osapi_compute_workers':     value => $osapi_compute_workers;
+    'DEFAULT/metadata_workers':          value => $metadata_workers;
+    'DEFAULT/use_forwarded_for':         value => $use_forwarded_for;
+    'DEFAULT/default_floating_pool':     value => $default_floating_pool;
+    'DEFAULT/fping_path':                value => $fping_path;
+    'DEFAULT/secure_proxy_ssl_header':   value => $secure_proxy_ssl_header;
+    'osapi_v3/enabled':                  value => $osapi_v3;
   }
 
   if ($neutron_metadata_proxy_shared_secret){

spec/classes/nova_api_spec.rb

@@ -66,7 +66,7 @@
         is_expected.to contain_nova_config('DEFAULT/metadata_workers').with('value' => '5')
         is_expected.to contain_nova_config('DEFAULT/default_floating_pool').with('value' => 'nova')
         is_expected.to contain_nova_config('DEFAULT/fping_path').with('value' => '/usr/sbin/fping')
-        is_expected.to contain_nova_config('oslo_middleware/secure_proxy_ssl_header').with('value' => '<SERVICE DEFAULT>')
+        is_expected.to contain_nova_config('DEFAULT/secure_proxy_ssl_header').with('value' => '<SERVICE DEFAULT>')
       end
 
       it 'do not configure v3 api' do
@@ -146,9 +146,9 @@
         is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '1')
         is_expected.to contain_nova_config('DEFAULT/metadata_workers').with('value' => '2')
         is_expected.to contain_nova_config('DEFAULT/default_floating_pool').with('value' => 'public')
+        is_expected.to contain_nova_config('DEFAULT/secure_proxy_ssl_header').with('value' => 'HTTP-X-Forwarded-Proto')
         is_expected.to contain_nova_config('neutron/service_metadata_proxy').with('value' => true)
         is_expected.to contain_nova_config('neutron/metadata_proxy_shared_secret').with('value' => 'secrete')
-        is_expected.to contain_nova_config('oslo_middleware/secure_proxy_ssl_header').with('value' => 'HTTP-X-Forwarded-Proto')
       end
 
       it 'configure nova api v3' do