python-horizon init scripts

Split out a new package horizon-standalone that just contains the init script for the
built in webserver.

Signed-off-by: Amy Fong <amy.fong@windriver.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-horizon/horizon.init b/meta-openstack/recipes-devtools/python/python-horizon/horizon.init
index 1c03b78..994fbec 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon/horizon.init
+++ b/meta-openstack/recipes-devtools/python/python-horizon/horizon.init
@@ -66,10 +66,6 @@ status()
     echo "$DESC is not running"
 }
 
-if [ -e /etc/apache2/conf.d/openstack-dashboard-apache.conf ]; then
-    chown -R daemon /usr/share/openstack-dashboard/openstack_dashboard/static
-fi
-
 case "$1" in
     start)
         start
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 153f4d4..59d875a 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -86,23 +86,26 @@ do_install_append() {
     sed -i -e 's#%PYTHON_SITEPACKAGES%#${PYTHON_SITEPACKAGES_DIR}#' ${D}/etc/apache2/conf.d/openstack-dashboard-apache.conf
 
     ln -fs openstack_dashboard/static ${D}/usr/share/openstack-dashboard/static
+
+    # daemon is UID 1
+    chown -R 1 ${D}/usr/share/openstack-dashboard/openstack_dashboard/static
 }
 
-PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-apache"
+PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-apache ${SRCNAME}-standalone"
 
 FILES_${PN} = "${libdir}/*"
 
 FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
 
 FILES_${SRCNAME} = "${bindir}/* \
-    ${sysconfdir}/init.d/* \
     ${datadir}/* \
     "
 
+FILES_${SRCNAME}-standalone = "${sysconfdir}/init.d/horizon"
+
 FILES_${SRCNAME}-apache = "/etc/apache2 \
     /etc/openstack-dashboard/ \
     /usr/share/openstack-dashboard/ \
-    /var/lib/openstack-dashboard \
     "
 
 RDEP_ARCH_VAR = ""
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
index b716052..a40883a 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
@@ -40,6 +40,7 @@ RDEPENDS_${PN} = " postgresql-setup \
     python-heat-cfntools \
     python-openstackclient \
     horizon \
+    horizon-standalone \
     horizon-apache \
     apache2 \
     novnc \