summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkanna <kanna@cumulusnetworks.com>2016-07-22 15:40:23 -0700
committerkanna <kanna@cumulusnetworks.com>2016-07-22 15:40:23 -0700
commit8f7b933c0cc3857c86c621abfed170abed902e53 (patch)
treede265e18c5ab458741aa357779d85c6c239664f6
parent1a0d760de9e572abcf64d146074e529a96cb5b69 (diff)
fix debian build/packaging
Ticket: CM-XXX Reviewed By: None Testing Done: sbuild
-rw-r--r--README.md (renamed from cumulus-ml2/mech_driver/__init__.py)0
-rw-r--r--cumulus-ml2/mech_driver/.driver.py.swpbin20480 -> 0 bytes
-rw-r--r--cumulus_ml2/mech_driver/__init__.py0
-rw-r--r--cumulus_ml2/mech_driver/config.py (renamed from cumulus-ml2/mech_driver/config.py)0
-rw-r--r--cumulus_ml2/mech_driver/driver.py (renamed from cumulus-ml2/mech_driver/driver.py)0
-rw-r--r--cumulus_ml2/mech_driver/hpb_bridge_agent.py (renamed from cumulus-ml2/mech_driver/hpb_bridge_agent.py)0
-rw-r--r--cumulus_ml2/utils/.discovery.py.swp (renamed from cumulus-ml2/utils/.discovery.py.swp)bin12288 -> 12288 bytes
-rw-r--r--cumulus_ml2/utils/discovery.py (renamed from cumulus-ml2/utils/discovery.py)0
-rw-r--r--cumulus_ml2/utils/misc.py (renamed from cumulus-ml2/utils/misc.py)0
-rw-r--r--debian/control11
-rw-r--r--debian/docs1
-rwxr-xr-xdebian/rules31
-rw-r--r--setup.cfg4
13 files changed, 39 insertions, 8 deletions
diff --git a/cumulus-ml2/mech_driver/__init__.py b/README.md
index e69de29..e69de29 100644
--- a/cumulus-ml2/mech_driver/__init__.py
+++ b/README.md
diff --git a/cumulus-ml2/mech_driver/.driver.py.swp b/cumulus-ml2/mech_driver/.driver.py.swp
deleted file mode 100644
index 2548ea1..0000000
--- a/cumulus-ml2/mech_driver/.driver.py.swp
+++ /dev/null
Binary files differ
diff --git a/cumulus_ml2/mech_driver/__init__.py b/cumulus_ml2/mech_driver/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cumulus_ml2/mech_driver/__init__.py
diff --git a/cumulus-ml2/mech_driver/config.py b/cumulus_ml2/mech_driver/config.py
index 91a42b1..91a42b1 100644
--- a/cumulus-ml2/mech_driver/config.py
+++ b/cumulus_ml2/mech_driver/config.py
diff --git a/cumulus-ml2/mech_driver/driver.py b/cumulus_ml2/mech_driver/driver.py
index 3d8cd89..3d8cd89 100644
--- a/cumulus-ml2/mech_driver/driver.py
+++ b/cumulus_ml2/mech_driver/driver.py
diff --git a/cumulus-ml2/mech_driver/hpb_bridge_agent.py b/cumulus_ml2/mech_driver/hpb_bridge_agent.py
index 26d318b..26d318b 100644
--- a/cumulus-ml2/mech_driver/hpb_bridge_agent.py
+++ b/cumulus_ml2/mech_driver/hpb_bridge_agent.py
diff --git a/cumulus-ml2/utils/.discovery.py.swp b/cumulus_ml2/utils/.discovery.py.swp
index e6a63a6..e6a63a6 100644
--- a/cumulus-ml2/utils/.discovery.py.swp
+++ b/cumulus_ml2/utils/.discovery.py.swp
Binary files differ
diff --git a/cumulus-ml2/utils/discovery.py b/cumulus_ml2/utils/discovery.py
index ae77e3f..ae77e3f 100644
--- a/cumulus-ml2/utils/discovery.py
+++ b/cumulus_ml2/utils/discovery.py
diff --git a/cumulus-ml2/utils/misc.py b/cumulus_ml2/utils/misc.py
index 3e4a897..3e4a897 100644
--- a/cumulus-ml2/utils/misc.py
+++ b/cumulus_ml2/utils/misc.py
diff --git a/debian/control b/debian/control
index c2ea3a8..40448f8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,17 @@
1Source: cumulus-ml2 1Source: cumulus-ml2
2Section: python 2Section: net
3Priority: extra 3Priority: extra
4Maintainer: dev-support <dev-support@cumulusnetworks.com> 4Maintainer: dev-support <dev-support@cumulusnetworks.com>
5Build-Depends: debhelper (>= 8.0.0), python-setuptools(>= 0.7), python-dev 5Build-Depends:
6 debhelper (>= 7.0.0),
7 python-all (>= 2.6.6-3),
8 python-setuptools
6Standards-Version: 3.9.3 9Standards-Version: 3.9.3
7Homepage: http://github.com/CumulusNetworks/altocumulus 10X-Python-Version: >= 2.7
8#Vcs-Git: git://git.debian.org/collab-maint/cumulus-ml2.git 11#Vcs-Git: git://git.debian.org/collab-maint/cumulus-ml2.git
9#Vcs-Browser: http://git.debian.org/?p=collab-maint/cumulus-ml2.git;a=summary 12#Vcs-Browser: http://git.debian.org/?p=collab-maint/cumulus-ml2.git;a=summary
10 13
11Package: cumulus-ml2-driver 14Package: cumulus-ml2
12Architecture: all 15Architecture: all
13Depends: ${python:Depends}, ${misc:Depends} 16Depends: ${python:Depends}, ${misc:Depends}
14Description: Mechanism ML2 Driver for Cumulus ML2 Plugin 17Description: Mechanism ML2 Driver for Cumulus ML2 Plugin
diff --git a/debian/docs b/debian/docs
index 583f7c7..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
1README.md README.md
2requirements.txt
diff --git a/debian/rules b/debian/rules
index 5d38e75..72319ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,5 +12,34 @@ PYTHONS:=$(shell pyversions -r)
12# Uncomment this to turn on verbose mode. 12# Uncomment this to turn on verbose mode.
13#export DH_VERBOSE=1 13#export DH_VERBOSE=1
14 14
15# We assume that the build machine is running the same environment as the
16# target system.
17ifeq ($(shell command -v systemctl > /dev/null && echo 1), 1)
18 HELPERS = python2,systemd
19else
20 HELPERS = python2
21endif
22
15%: 23%:
16 dh $@ --with python2 24 dh $@ --buildsystem=python_distutils --with $(HELPERS)
25
26override_dh_auto_install:
27 set -e && for pyvers in $(shell pyversions -r); do \
28 $$pyvers setup.py install --install-layout=deb \
29 --root $(CURDIR)/debian/cumulus-ml2; \
30 done
31
32override_dh_clean:
33 dh_clean -O--buildsystem=python_distutils
34 rm -rf build __pycache__
35 rm -rf *.egg-info
36
37override_dh_installinit:
38 dh_installinit --name=cumulus-ml2
39
40override_dh_systemd_enable:
41 dh_systemd_enable --no-enable --name=cumulus-ml2
42
43override_dh_systemd_start:
44 dh_systemd_start --no-start --name=cumulus-ml2
45
diff --git a/setup.cfg b/setup.cfg
index ee5ab5f..da7e0a8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,11 +8,11 @@ description-file =
8packages = 8packages =
9 cumulus-ml2 9 cumulus-ml2
10data_files = 10data_files =
11 /etc/cumulus-ml2 = etc/cumulus-ml2/config.yaml 11 /etc/cumulus-ml2 = etc/cumulus/config.yaml
12 12
13[entry_points] 13[entry_points]
14neutron.ml2.mechanism_drivers = 14neutron.ml2.mechanism_drivers =
15 cumulus = cumulus-ml2.mech-driver.driver:CumulusMechanismDriver 15 cumulus = cumulus_ml2.mech_driver.driver:CumulusMechanismDriver
16 16
17[global] 17[global]
18setup-hooks = 18setup-hooks =