From fca79d93b621a208737f8f2a98dede3797e5d8a1 Mon Sep 17 00:00:00 2001
From: Christopher Aedo <doc@aedo.net>
Date: Wed, 7 Oct 2015 11:50:53 -0700
Subject: [PATCH] Move enabled directory to app_catalog

This commit moves the enabled directory from
the root of the repo to the app_catalog
directory. This will allow the directory to
be included in the python package, and
matches the layout of a few other Horizon-
related projects.

Change-Id: Icb63b8c996826fccc2ba785be0321396d8a803fd
---
 MANIFEST.in                                                     | 2 +-
 README.rst                                                      | 2 +-
 .../enabled}/_80_project_catalog_panel_group.py                 | 0
 .../enabled}/_90_project_app_catalog_panel.py                   | 0
 .../enabled}/_91_project_component_catalog_panel.py             | 0
 devstack/plugin.sh                                              | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename {enabled => app_catalog/enabled}/_80_project_catalog_panel_group.py (100%)
 rename {enabled => app_catalog/enabled}/_90_project_app_catalog_panel.py (100%)
 rename {enabled => app_catalog/enabled}/_91_project_component_catalog_panel.py (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 17fbae7..777fba6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include setup.py
 
-recursive-include enabled *
+recursive-include app_catalog/enabled *
 recursive-include app_catalog/static *
 recursive-include app_catalog/templates *
 recursive-include component_catalog/templates *
diff --git a/README.rst b/README.rst
index 1e288ef..5bd1d56 100644
--- a/README.rst
+++ b/README.rst
@@ -35,7 +35,7 @@ With Horizon
   cp ./openstack_dashboard/local/local_settings.py.example ./openstack_dashboard/local/local_settings.py
   pushd ../apps-catalog-ui
   ../horizon/tools/with_venv.sh pip install --upgrade .
-  cp -a enabled/* ../horizon/openstack_dashboard/enabled/
+  cp -a app_catalog/enabled/* ../horizon/openstack_dashboard/enabled/
   popd
 
   #FOR Murano Dashboard support:
diff --git a/enabled/_80_project_catalog_panel_group.py b/app_catalog/enabled/_80_project_catalog_panel_group.py
similarity index 100%
rename from enabled/_80_project_catalog_panel_group.py
rename to app_catalog/enabled/_80_project_catalog_panel_group.py
diff --git a/enabled/_90_project_app_catalog_panel.py b/app_catalog/enabled/_90_project_app_catalog_panel.py
similarity index 100%
rename from enabled/_90_project_app_catalog_panel.py
rename to app_catalog/enabled/_90_project_app_catalog_panel.py
diff --git a/enabled/_91_project_component_catalog_panel.py b/app_catalog/enabled/_91_project_component_catalog_panel.py
similarity index 100%
rename from enabled/_91_project_component_catalog_panel.py
rename to app_catalog/enabled/_91_project_component_catalog_panel.py
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6e9d988..4405989 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -5,7 +5,7 @@ APP_CAT_UI_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd)
 function install_app-catalog-ui {
     sudo pip install --upgrade ${APP_CAT_UI_DIR}
     cp -a ${APP_CAT_UI_DIR}/app_catalog/static ${DEST}/horizon/
-    cp -a ${APP_CAT_UI_DIR}/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/
+    cp -a ${APP_CAT_UI_DIR}/app_catalog/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/
     python ${DEST}/horizon/manage.py compress --force
 }