From e74af2a02621b4add947ee520f7105f79bd98506 Mon Sep 17 00:00:00 2001
From: Jin Nan Zhang <zhang.jinnan@99cloud.net>
Date: Tue, 23 Feb 2016 18:21:14 -0500
Subject: [PATCH] fixed compilemessages error when install use devstack

Can not find freezer_ui module when install freezer-web-ui use devstack.
This is devstack template is not correct.

Change-Id: Ib3df17f6ddc4a6d2d245818091d97407c159d693
Closes-Bug: #1548659
---
 devstack/files/_5050_freezer.py.template | 10 +++++++++
 devstack/files/_50_freezer.py.template   | 28 ------------------------
 devstack/lib/freezer-web-ui              |  8 +++----
 3 files changed, 14 insertions(+), 32 deletions(-)
 create mode 100644 devstack/files/_5050_freezer.py.template
 delete mode 100644 devstack/files/_50_freezer.py.template

diff --git a/devstack/files/_5050_freezer.py.template b/devstack/files/_5050_freezer.py.template
new file mode 100644
index 0000000..f9e97d4
--- /dev/null
+++ b/devstack/files/_5050_freezer.py.template
@@ -0,0 +1,10 @@
+# The name of the dashboard to be added to HORIZON['dashboards']. Required.
+DASHBOARD = 'disaster_recovery'
+
+# If set to True, this dashboard will not be added to the settings.
+DISABLED = False
+
+# A list of applications to be added to INSTALLED_APPS.
+ADD_INSTALLED_APPS = [
+    'disaster_recovery',
+]
diff --git a/devstack/files/_50_freezer.py.template b/devstack/files/_50_freezer.py.template
deleted file mode 100644
index ae1dec7..0000000
--- a/devstack/files/_50_freezer.py.template
+++ /dev/null
@@ -1,28 +0,0 @@
-# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# The name of the dashboard to be added to HORIZON['dashboards']. Required.
-DASHBOARD = 'freezer_ui'
-
-# If set to True, this dashboard will not be added to the settings.
-DISABLED = False
-
-# Until there is a more elegant SYSPATH var scheme...
-import sys
-sys.path.append('%FREEZER_WEB_UI_DIR%')
-
-# A list of applications to be added to INSTALLED_APPS.
-ADD_INSTALLED_APPS = [
-    'freezer_ui',
-]
diff --git a/devstack/lib/freezer-web-ui b/devstack/lib/freezer-web-ui
index 83b45a9..870036c 100644
--- a/devstack/lib/freezer-web-ui
+++ b/devstack/lib/freezer-web-ui
@@ -57,13 +57,13 @@ function configure_freezer_web_ui {
 function init_freezer_web_ui {
     if is_service_enabled horizon; then
 
-        local dashboard_enabled_50_freezer_py="$HORIZON_DIR/openstack_dashboard/enabled/_50_freezer.py"
+        local dashboard_enabled_5050_freezer_py="$HORIZON_DIR/openstack_dashboard/enabled/_5050_freezer.py"
 
-        sudo cp $FREEZER_WEB_UI_FILES/_50_freezer.py.template $dashboard_enabled_50_freezer_py
+        sudo cp $FREEZER_WEB_UI_FILES/_5050_freezer.py.template $dashboard_enabled_5050_freezer_py
 
         sudo sed -e "
             s|%FREEZER_WEB_UI_DIR%|$FREEZER_WEB_UI_DIR|g
-        " -i $dashboard_enabled_50_freezer_py
+        " -i $dashboard_enabled_5050_freezer_py
 
     fi
 }
@@ -87,4 +87,4 @@ function install_freezer_client {
 
 
 # Restore xtrace
-$XTRACE
\ No newline at end of file
+$XTRACE