Skip to content

Commit

Permalink
Related-Bug: #1463208 - Moving Server Manager Client CLI to Cliff Fra…
Browse files Browse the repository at this point in the history
…mework

This check-in:
- Added packaging scripts
- Packaging pip installable .tar.gz package
- Packaging additional wrapper debian for above .tar.gz

Patch 2:
- Added scripts to package with server-manager-installer package
- Debian can be installed with or without installer
- Setup script changes to include cliff client

Change-Id: I275416207e090f420e1edfaafd95313b31b50899
  • Loading branch information
nitishkrishna committed Sep 22, 2015
1 parent a23c731 commit 0b570f0
Show file tree
Hide file tree
Showing 9 changed files with 127 additions and 0 deletions.
14 changes: 14 additions & 0 deletions build/deb_server_manager_setup.sh
Expand Up @@ -16,6 +16,7 @@ echo "$arrow This install is being logged at: $log_file"
ALL=""
SM=""
SMCLIENT=""
SMCLIFFCLIENT=""
HOSTIP=""
SMMON=""
NOSMMON=""
Expand All @@ -40,6 +41,7 @@ function usage()
echo "--nosm-mon"
echo "--sm"
echo "--sm-client"
echo "--sm-cliff-client"
echo "--webui"
echo "--sm-mon"
echo "--hostip=<HOSTIP>"
Expand Down Expand Up @@ -158,6 +160,7 @@ while [ "$1" != "" ]; do
WEBUI="contrail-web-server-manager"
WEBCORE="contrail-web-core"
SMCLIENT="contrail-server-manager-client"
SMCLIFFCLIENT="contrail-server-manager-cliff-client"
SMMON="contrail-server-manager-monitoring"
;;
--smlite)
Expand All @@ -182,6 +185,9 @@ while [ "$1" != "" ]; do
--sm-client)
SMCLIENT="contrail-server-manager-client"
;;
--sm-cliff-client)
SMCLIFFCLIENT="contrail-server-manager-cliff-client"
;;
--hostip)
HOSTIP=$VALUE
rm -rf /opt/contrail/contrail-server-manager/IP.txt
Expand Down Expand Up @@ -302,6 +308,14 @@ if [ "$SMCLIENT" != "" ]; then
echo "$arrow Completed Installing Server Manager Client"
fi

if [ "$SMCLIFFCLIENT" != "" ]; then
echo "$arrow Server Manager Cliff Client"
echo "$space$arrow$install_str Server Manager Cliff Client"
apt-get -y install contrail-server-manager-cliff-client >> $log_file 2>&1
apt-get -y install -f >> $log_file 2>&1
echo "$arrow Completed Installing Server Manager Cliff Client"
fi

if [ "$WEBUI" != "" ] && [ "$NOWEBUI" == "" ]; then
echo "$arrow Web Server Manager"
# install webui
Expand Down
Expand Up @@ -54,6 +54,11 @@ pkgs = contrail-server-manager-client
makeloc = tools/packaging/common/debian
target = contrail-server-manager-client-deb

[contrail-server-manager-cliff-client]
pkgs = contrail-server-manager-cliff-client
makeloc = tools/packaging/common/debian
target = contrail-server-manager-cliff-client-deb

[contrail-web-core]
pkgs = contrail-web-core
makeloc = tools/packaging/common/debian
Expand Down
12 changes: 12 additions & 0 deletions common/debian/Makefile
Expand Up @@ -132,6 +132,7 @@ all_vmware: ${PACKAGES_VMWARE}
server-manager-all: contrail-server-manager-deb \
contrail-server-manager-lite-deb \
contrail-server-manager-client-deb \
contrail-server-manager-cliff-client-deb \
contrail-server-manager-monitoring-deb \
contrail-server-manager-installer-deb

Expand Down Expand Up @@ -279,6 +280,17 @@ contrail-server-manager-client-deb:
(cd ${BUILDDIR}; fakeroot debian/rules clean)
(cd ${BUILDDIR}; fakeroot debian/rules binary)

contrail-server-manager-cliff-client-deb:
$(eval BUILDDIR=${SB_TOP}/build/debian/contrail-server-manager-cliff-client)
rm -rf ${BUILDDIR}
mkdir -p ${BUILDDIR}/debian
@echo "$(VERSION)" > $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/contrail_version.txt
@echo "$(CONTRAIL_SKU)" > $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/contrail_sku.txt
cp -ar ${SB_TOP}/tools/packaging/common/debian/contrail-server-manager-cliff-client/debian ${BUILDDIR}
(cd ${BUILDDIR}; fakeroot debian/rules clean)
(cd ${BUILDDIR}; fakeroot debian/rules binary)
(mkdir -p $(SB_TOP)/build/tools/; cp $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/dist/servermanagercli-$(VERSION)-$(CONTRAIL_SKU).tar.gz $(SB_TOP)/build/tools/)

contrail-server-manager-monitoring-deb:
$(eval BUILDDIR=${SB_TOP}/build/debian/contrail-server-manager-monitoring)
rm -rf ${BUILDDIR}
Expand Down
@@ -0,0 +1,6 @@
contrail-server-manager-cliff-client (BUILDTAG) nitishk; urgency=low

[nitishk ]
* debian/changelog: changelog

-- nitishk <nitishk@juniper.net> Mon Jul 13 14:20:51 PDT 2015
@@ -0,0 +1 @@
8
21 changes: 21 additions & 0 deletions common/debian/contrail-server-manager-cliff-client/debian/control
@@ -0,0 +1,21 @@
Source: contrail-server-manager-cliff-client
Maintainer: nitishk <nitishk@juniper.net>
Section: misc
Priority: optional
Standards-Version: 1.0
Build-Depends: debhelper (>= 8)

Package: contrail-server-manager-cliff-client
Architecture: all
Maintainer: nitishk <nitishk@juniper.net>
Depends: python,
python-pip,
python-cliff,
python-configparser,
python-pyparsing,
python-pbr,
python-six,
python-pycurl
Section: contrail-server-manager-cliff-client
Priority: extra
Description: Contrail Server Manager Cliff Client Package
@@ -0,0 +1,5 @@
Name: contrail-server-manager-cliff-client
Maintainer: nitishk <nitishk@juniper.net>
License: Commercial
Files: *
Copyright (c) 2015 Juniper Networks, Inc. All rights reserved.
@@ -0,0 +1,8 @@
#!/bin/sh

set -e


echo "running post install"

/opt/contrail/bin/setup_server_manager_client.sh
55 changes: 55 additions & 0 deletions common/debian/contrail-server-manager-cliff-client/debian/rules
@@ -0,0 +1,55 @@
#!/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\/contrail-server-manager-cliff-client//g")
export BUILDTIME := $(shell date -u +%y%m%d%H%M)
export src_path := $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/
export build_root := $(SB_TOP)/build/debian/contrail-server-manager-cliff-client/debian/contrail-server-manager-cliff-client
export _pyver := 2.7
export _pysitepkg := /lib/python${_pyver}/site-packages
export python_sitelib := /usr/local/lib/python${_pyver}/dist-packages
export _contrailopt := /opt/contrail
__python ?= /usr/bin/python

SRC_VER := $(shell cat $(SB_TOP)/controller/src/base/version.info)
CONTRAIL_SKU := $(shell cat $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/contrail_sku.txt)
BUILDTAG =
ifdef TAG
BUILDTAG = $(SRC_VER)-$(TAG)
else
BUILDTAG = $(SRC_VER)-$(BUILDTIME)
endif

%:
dh $@ --tmpdir=${build_root} --destdir=${SB_TOP}/build/debian

override_dh_auto_build:
cat debian/changelog.in | sed 's,BUILDTAG,$(BUILDTAG),g' > debian/changelog
rm -rf $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/dist
rm -rf $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/servermanagercli.egg-info
(cd $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/ && ${__python} setup.py sdist)

override_dh_auto_install:
# Cleanup directories
rm -rf $(build_root)
mkdir -p $(build_root)
mkdir -p $(build_root)$(_contrailopt)
mkdir -p $(build_root)$(_contrailopt)/bin
# Install directories
install -d -m 755 $(build_root)$(_contrailopt)
install -d -m 755 $(build_root)$(_contrailopt)/bin
# Copy/install files
(cd $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/dist/ && tar zxf servermanagercli-$(BUILDTAG)-$(CONTRAIL_SKU).tar.gz)
(cd $(SB_TOP)/tools/contrail-server-manager/src/smgr_cliff_client/dist/servermanagercli-$(BUILDTAG)-$(CONTRAIL_SKU) && ${__python} setup.py install --root=$(build_root) --install-scripts ${_contrailopt}/bin/)
override_dh_shlibdeps:

override_dh_usrlocal:

0 comments on commit 0b570f0

Please sign in to comment.