From 915f0741adcd4becfa2f5156203a5c06a6cc62d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne@iweb.com>
Date: Mon, 16 Feb 2015 14:00:20 -0500
Subject: [PATCH] Sort policy files in local_settings.py

Hash order isn't preserved before Ruby 1.9.2.
This change preserves the order for those running Ruby 1.8.

Change-Id: I046a3e1c0b5efe5722d39ff91e01e94979204943
Closes-bug: #1422461
---
 spec/classes/horizon_init_spec.rb | 4 ++--
 templates/local_settings.py.erb   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/classes/horizon_init_spec.rb b/spec/classes/horizon_init_spec.rb
index 7c7093c5..f82f4c2b 100644
--- a/spec/classes/horizon_init_spec.rb
+++ b/spec/classes/horizon_init_spec.rb
@@ -216,8 +216,8 @@ describe 'horizon' do
         params.merge!({
           :policy_files_path => '/opt/openstack-dashboard',
           :policy_files      => {
-            'identity' => 'keystone_policy.json',
             'compute'  => 'nova_policy.json',
+            'identity' => 'keystone_policy.json',
             'network'  => 'neutron_policy.json',
           }
         })
@@ -227,8 +227,8 @@ describe 'horizon' do
         verify_concat_fragment_contents(subject, 'local_settings.py', [
           "POLICY_FILES_PATH = '/opt/openstack-dashboard'",
           "POLICY_FILES = {",
-          "    'identity': 'keystone_policy.json',",
           "    'compute': 'nova_policy.json',",
+          "    'identity': 'keystone_policy.json',",
           "    'network': 'neutron_policy.json',",
           "} # POLICY_FILES"
         ])
diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb
index e1a781c7..dbeb9e88 100644
--- a/templates/local_settings.py.erb
+++ b/templates/local_settings.py.erb
@@ -289,7 +289,7 @@ POLICY_FILES_PATH = '/etc/openstack-dashboard'
 # Map of local copy of service policy files
 <% if @policy_files.kind_of?(Hash) %>
 POLICY_FILES = {
-<% @policy_files.each do |service_name,filename| -%>
+<% @policy_files.sort.each do |service_name,filename| -%>
     '<%= service_name -%>': '<%= filename -%>',
 <% end -%>
 } # POLICY_FILES