Clean up debian packaging. Install dependencies from distro repos.

Change-Id: I77a3243382388dae78199f54176e6f8b01e63777

debian/barbican-api.dirs

@@ -1 +0,0 @@
-/var/lib/barbican/temp

debian/barbican-api.postinst

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]
-then
-
-    # TBD: If we need to ask the user for config info such as 'use lightweight/standalone mode?', 
-    #   then look at Glance's glance-api.postinst
-    # . /usr/share/debconf/confmodule
-
-    chown barbican:barbican /var/lib/barbican -R
-fi
-
-#DEBHELPER#

debian/barbican-api.prerm

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case $1 in
-    remove|purge)
-        if [ -x /etc/init.d/barbican-api ]; then
-            invoke-rc.d barbican-api stop || true
-        fi
-        ;;
-esac
-
-#DEBHELPER#
-

debian/barbican-common.postinst

@@ -18,17 +18,6 @@ then
     chmod 0750 /var/log/barbican/
     chown barbican:barbican -R /var/lib/barbican/ /etc/barbican/
     chmod 0700 /etc/barbican/
-
-    # TODO: Replace these pip requirements with a true Debian package equivalent (via stdeb perhaps).
-    pip install uwsgi
-    pip install falcon
-    pip install oslo.config
-    pip install webob
-    pip install PasteDeploy
-    pip install stevedore
-    pip install pycrypto
-    pip install python-dateutil
-    pip install jsonschema
 fi
 
 #DEBHELPER#

debian/control

@@ -1,72 +1,39 @@
 Source: barbican
-Section: net
+Section: python
 Priority: extra
-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders: John Wood <john.wood@rackspace.com>
-Build-Depends: debhelper (>= 7.0.50),
- po-debconf,
- python-all (>= 2.6.6-3~),
- sqlite3,
- curl,
- pep8,
- python-boto,
- python-crypto,
- python-eventlet,
- python-httplib2 (>= 0.6.0),
- python-iso8601,
- python-kombu,
- python-novaclient,
- python-migrate,
- python-mox,
- python-nose,
- python-paste,
- python-pastedeploy,
- python-routes,
- python-setuptools,
- python-sphinx,
- python-sqlalchemy (>= 0.7.4),
- python-pysqlite2,
- python-swift,
- python-webob,
- python-xattr,
- procps
+Maintainer: CloudKeep Project <cloudkeep@googlegroups.com>
+Uploaders: John Wood <john.wood@rackspace.com>,
+ Douglas Mendizabal <douglas.mendizabal@rackspace.com>
+Build-Depends: debhelper (>= 9), python
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.6
 Homepage: http://launchpad.net/barbican
 Vcs-Browser: https://github.com/jfwood/barbican
 Vcs-Git: git://github.com/jfwood/barbican.git
 
-Package: python-barbican
-Architecture: amd64
-Section: python
-Depends: ${python:Depends}, ${misc:Depends},
- python-boto,
- python-crypto,
- python-eventlet,
- python-httplib2 (>= 0.6.0),
- python-iso8601,
- python-kombu,
- python-migrate,
- python-pastedeploy,
- python-routes,
- python-sqlalchemy (>= 0.7.4),
- python-pysqlite2,
- python-swift,
- python-webob,
- python-xattr
-Description: OpenStack Key Management Service - Python client library
- The Barbican project provides services for storing and retrieving sensitive 
- client information such as encryption keys.
- .
- This package contains the Python client libraries.
-
 Package: barbican-common
 Architecture: amd64
 Section: python
 Depends: ${python:Depends}, ${misc:Depends},
- python-barbican (= ${binary:Version}),
+ python-celery,
+ python-crypto,
+ python-dateutil,
+ python-eventlet,
+ python-falcon,
+ python-iso8601,
+ python-jsonschema,
+ python-keystoneclient,
+ python-kombu,
+ python-pastedeploy,
+ python-pysqlite2,
+ python-sqlalchemy (>= 0.7.4),
+ python-stevedore,
+ python-webob,
+ uwsgi,
+ uwsgi-plugin-python,
  adduser,
  debconf,
+ python-pip,
 Description: OpenStack Key Management Service - common files
  The Barbican project provides services for storing and retrieving sensitive 
  client information such as encryption keys.
@@ -84,13 +51,13 @@ Description: OpenStack Key Management Service - API Server
  .
  This package contains the Barbican API Server.
 
-Package: barbican
+Package: barbican-worker
 Architecture: amd64
 Section: python
-Depends: barbican-api (= ${binary:Version}),
- ${misc:Depends}
-Description: OpenStack Key Management Service - metapackage
+Depends: ${python:Depends}, ${misc:Depends},
+ barbican-common (= ${binary:Version}),
+Description: OpenStack Key Management Service - Worker Node
  The Barbican project provides services for storing and retrieving sensitive 
  client information such as encryption keys.
  .
- This is a dependency package to install all of the Cloudkeep suite.
+ This package contains the Barbican Worker Node.

debian/python-barbican.install

@@ -1 +0,0 @@
-usr/lib/python*/dist-packages/*

debian/rules

@@ -11,8 +11,12 @@
 #	bash run_tests.sh -N || true
 #endif
 
+override_dh_auto_install:
+	python setup.py install --root=debian/barbican-common --install-layout=deb
+
 # TBD: Use this when we are ready for sphinx docs
-#override_dh_auto_build:
+override_dh_auto_build:
+
 #	dh_auto_build
 #ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 #	mkdir -p doc/build
@@ -21,6 +25,9 @@
 #	mkdir -p doc/build/html
 #endif
 
+override_dh_python2:
+	dh_python2 --no-guessing-deps
+
 override_dh_auto_clean:
 	dh_auto_clean
 # TDB: OpenStack:	debconf-updatepo

etc/barbican/vassals/barbican-admin.ini

@@ -5,4 +5,5 @@ processes = 1
 vacuum = true
 no-default-app = true
 memory-report = true
+plugins = python
 paste = config:/etc/barbican/barbican-admin-paste.ini

etc/barbican/vassals/barbican-api.ini

@@ -5,4 +5,5 @@ processes = 1
 vacuum = true
 no-default-app = true
 memory-report = true
+plugins = python
 paste = config:/etc/barbican/barbican-api-paste.ini