enable compilation and bundling of contrail-openstack-dashboard and c…

…ontrail-ceilometer-plugin Change-Id: Ib4bb2338b51c7687a54567a5b847937190316edd Closes-Bug: #1549535
Juniper · Feb 25, 2016 · b6f4130 · b6f4130
1 parent 4b501df
commit b6f4130
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg b/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg
@@ -128,9 +128,9 @@ pkgs      = ifmap-python-client
 makeloc   = tools/packaging/common/debian
 builtloc  = build/packages
 
-#[contrail-openstack-dashboard-deb]
-#pkgs      = contrail-openstack-dashboard
-#makeloc   = tools/packaging/common/debian
+[contrail-openstack-dashboard-deb]
+pkgs      = contrail-openstack-dashboard
+makeloc   = tools/packaging/common/debian
 
 #[contrail-ostack-dashboard-deb]
 #pkgs      = openstack-dashboard
@@ -146,10 +146,10 @@ pkgs      = neutron-plugin-contrail
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/debian/
 
-#[ceilometer-plugin-contrail-deb]
-#pkgs      = ceilometer-plugin-contrail
-#makeloc   = tools/packaging/common/debian
-#builtloc  = build/debian/
+[ceilometer-plugin-contrail-deb]
+pkgs      = ceilometer-plugin-contrail
+makeloc   = tools/packaging/common/debian
+builtloc  = build/debian/
 
 # Virtual Target; Just picks up already built packages
 [vrouter-openstack-extra]

diff --git a/common/debian/Makefile b/common/debian/Makefile
@@ -493,7 +493,7 @@ contrail-openstack-config-liberty-clean:
 	(cd ${SB_TOP}/tools/packaging/common/debian/contrail-openstack-config; fakeroot debian/rules clean)
 
 contrail-openstack-dashboard-deb:
-	if [ '${CONTRAIL_SKU}' != 'liberty' ]; then \
+	if [ -d ${SB_TOP}/contrail-horizon ]; then \
 		$(eval BUILDDIR=${SB_TOP}/build/debian/contrail-openstack-dashboard) \
 		mkdir -p ${BUILDDIR}/debian; \
 		cp -R ${SB_TOP}/contrail-horizon/* ${BUILDDIR}; \