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

…ontrail-ceilometer-plugin

Closes-Bug: #1549535
(cherry picked from commit b6f4130)

create a new directory liberty with debian files
adding contrail-openstack dependency on contrail-openstack-dashboard
Closes-Bug: #1549535

Change-Id: I26fcf837e7444502d7bc1c0ce094b5722c29139c
(cherry picked from commit 7fbd998)

Conflicts:
	common/debian/contrail-openstack/debian/control.liberty.in

Change-Id: Ib4bb2338b51c7687a54567a5b847937190316edd

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]

common/debian/Makefile

@@ -492,7 +492,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}; \

common/debian/contrail-openstack-dashboard/debian/liberty/changelog.in

@@ -0,0 +1,7 @@
+contrail-openstack-dashboard (BUILDTAG) quantal; urgency=low
+
+  * Initial release.
+
+ -- Rahul Sharma <rahuls@juniper.net>  Mon, 10 Feb 2014 21:55:40 +5:30
+
+

common/debian/contrail-openstack-dashboard/debian/liberty/compat

@@ -0,0 +1 @@
+8

common/debian/contrail-openstack-dashboard/debian/liberty/contrail-openstack-dashboard.postinst

@@ -0,0 +1,11 @@
+#!/bin/sh
+# vim: set ts=2 et:
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+  if [ -e /usr/share/openstack-dashboard/openstack_dashboard/static ] ; then
+    cp -L -prf --remove-destination /usr/lib/python2.7/dist-packages/contrail_openstack_dashboard/openstack_dashboard/static/*    /usr/share/openstack-dashboard/openstack_dashboard/static
+  fi
+fi
+#DEBHELPER#

common/debian/contrail-openstack-dashboard/debian/liberty/contrail-openstack-dashboard.postrm

@@ -0,0 +1,11 @@
+#!/bin/sh
+# vim: set ts=2 et:
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then
+  if [ -e /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js/contrail.networktopology.js ] ; then
+    rm -f /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js/contrail.networktopology.js
+  fi
+fi
+#DEBHELPER#

common/debian/contrail-openstack-dashboard/debian/liberty/control

@@ -0,0 +1,11 @@
+Source: contrail-openstack-dashboard
+Section: python
+Priority: optional
+Maintainer: Rahul Sharma <rahuls@juniper.net>
+Standards-Version: 1.1
+Homepage: https://github.com/Juniper/contrail-horizon
+
+Package: contrail-openstack-dashboard
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, openstack-dashboard
+Description: Openstack Dashboard implementation for Contrail Neutron Plugin.

common/debian/contrail-openstack-dashboard/debian/liberty/copyright

@@ -0,0 +1,5 @@
+Name:     contrail-openstack-dashboard
+Maintainer: Rahul Sharma <rahuls@juniper.net>
+License:  Apache 2.0
+Files: *
+ Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.

common/debian/contrail-openstack-dashboard/debian/liberty/rules

@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+SPEC_DIR := $(shell pwd)
+export SB_TOP := $(shell pwd | sed -re "s/(.*)\/build\/debian\/(.*)/\1/")
+export BUILDTIME := $(shell date -u +%y%m%d%H%M)
+export buildroot := $(SB_TOP)/build/debian/contrail-openstack-dashboard
+export PY_DIST_PATH := /usr/lib/python2.7/dist-packages
+
+SRC_VER := $(shell cat $(SB_TOP)/controller/src/base/version.info)
+
+BUILDTAG =
+ifdef TAG
+BUILDTAG = $(SRC_VER)-$(TAG)
+else
+BUILDTAG = $(SRC_VER)-$(BUILDTIME)
+endif
+
+%:
+	dh $@ --destdir=${SB_TOP}/build/debian --with python2
+
+override_dh_auto_build:
+	cat debian/changelog.in | sed 's,BUILDTAG,$(BUILDTAG),g' > debian/changelog
+
+override_dh_auto_install:
+	# Setup directories
+	install -d -m 755 $(buildroot)/debian/contrail-openstack-dashboard/$(PY_DIST_PATH)/contrail_openstack_dashboard
+	install -d -m 755 $(buildroot)/debian/contrail-openstack-dashboard/$(PY_DIST_PATH)/contrail_openstack_dashboard/openstack_dashboard
+	cp -a $(buildroot)/*.py $(buildroot)/debian/contrail-openstack-dashboard/$(PY_DIST_PATH)/contrail_openstack_dashboard
+	cp -a $(buildroot)/openstack_dashboard/ $(buildroot)/debian/contrail-openstack-dashboard/$(PY_DIST_PATH)/contrail_openstack_dashboard/
+
+override_dh_shlibdeps:
+
+override_dh_usrlocal: