diff --git a/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg b/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg index 4e1115acd..1b5db2a26 100644 --- 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 index 2ab43ceee..d766301f3 100644 --- a/common/debian/Makefile +++ b/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}; \ diff --git a/common/debian/contrail-openstack-dashboard/debian/liberty/changelog.in b/common/debian/contrail-openstack-dashboard/debian/liberty/changelog.in new file mode 100644 index 000000000..58f569efd --- /dev/null +++ b/common/debian/contrail-openstack-dashboard/debian/liberty/changelog.in @@ -0,0 +1,7 @@ +contrail-openstack-dashboard (BUILDTAG) quantal; urgency=low + + * Initial release. + + -- Rahul Sharma Mon, 10 Feb 2014 21:55:40 +5:30 + + diff --git a/common/debian/contrail-openstack-dashboard/debian/liberty/compat b/common/debian/contrail-openstack-dashboard/debian/liberty/compat new file mode 100644 index 000000000..45a4fb75d --- /dev/null +++ b/common/debian/contrail-openstack-dashboard/debian/liberty/compat @@ -0,0 +1 @@ +8 diff --git a/common/debian/contrail-openstack-dashboard/debian/liberty/contrail-openstack-dashboard.postinst b/common/debian/contrail-openstack-dashboard/debian/liberty/contrail-openstack-dashboard.postinst new file mode 100644 index 000000000..472ef9fa0 --- /dev/null +++ b/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# diff --git a/common/debian/contrail-openstack-dashboard/debian/liberty/contrail-openstack-dashboard.postrm b/common/debian/contrail-openstack-dashboard/debian/liberty/contrail-openstack-dashboard.postrm new file mode 100644 index 000000000..fc6413b6b --- /dev/null +++ b/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# diff --git a/common/debian/contrail-openstack-dashboard/debian/liberty/control b/common/debian/contrail-openstack-dashboard/debian/liberty/control new file mode 100644 index 000000000..da726c978 --- /dev/null +++ b/common/debian/contrail-openstack-dashboard/debian/liberty/control @@ -0,0 +1,11 @@ +Source: contrail-openstack-dashboard +Section: python +Priority: optional +Maintainer: Rahul Sharma +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. diff --git a/common/debian/contrail-openstack-dashboard/debian/liberty/copyright b/common/debian/contrail-openstack-dashboard/debian/liberty/copyright new file mode 100644 index 000000000..cdb0d8df0 --- /dev/null +++ b/common/debian/contrail-openstack-dashboard/debian/liberty/copyright @@ -0,0 +1,5 @@ +Name: contrail-openstack-dashboard +Maintainer: Rahul Sharma +License: Apache 2.0 +Files: * + Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. diff --git a/common/debian/contrail-openstack-dashboard/debian/liberty/rules b/common/debian/contrail-openstack-dashboard/debian/liberty/rules new file mode 100755 index 000000000..3c7967d8d --- /dev/null +++ b/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: