Browse Source

Fix the debian packaging

Ticket: CM-12268
Reviewed By: None
Testing Done: Unit

    Deb package for cumulus-ml2 module wasn't getting created properly. Because of this files were not getting installed when the package is installed. Fixed the path of the destination directory where files had to be copied and also added explicit copy command to copy the ml2_cumulus.ini in the setup.cfg file.
radhika 2 years ago
parent
commit
bd550455f3
6 changed files with 13 additions and 14 deletions
  1. 1
    1
      cumulus_ml2/mech_driver/driver.py
  2. 1
    1
      debian/control
  3. 3
    3
      debian/cumulus-ml2-driver.install
  4. 3
    6
      debian/rules
  5. 1
    2
      rpm/SPECS/cumulus.spec
  6. 4
    1
      setup.cfg

+ 1
- 1
cumulus_ml2/mech_driver/driver.py View File

@@ -10,7 +10,7 @@ from neutron.i18n import _LE, _LI, _LW
10 10
 from neutron.plugins.ml2.common.exceptions import MechanismDriverError
11 11
 from neutron.plugins.ml2.driver_api import MechanismDriver
12 12
 
13
-from mech_driver.ml2 import config
13
+from mech_driver import config
14 14
 
15 15
 LOG = logging.getLogger(__name__)
16 16
 NETWORKS_URL = '{scheme}://{base}:{port}/ml2/v1/networks/{network}'

+ 1
- 1
debian/control View File

@@ -11,7 +11,7 @@ X-Python-Version: >= 2.7
11 11
 #Vcs-Git: git://git.debian.org/collab-maint/cumulus-ml2.git
12 12
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/cumulus-ml2.git;a=summary
13 13
 
14
-Package: cumulus-ml2
14
+Package: cumulus-ml2-driver
15 15
 Architecture: all
16 16
 Depends: ${python:Depends}, ${misc:Depends}
17 17
 Description: Mechanism ML2 Driver for Cumulus ML2 Plugin

+ 3
- 3
debian/cumulus-ml2-driver.install View File

@@ -1,3 +1,3 @@
1
-debian/tmp/usr/lib/python2.7/dist-packages/cumulus_ml2/mech_driver/*.py
2
-debian/tmp/usr/lib/python2.7/dist-packages/cumulus_ml2/utils/*.py
3
-debian/tmp/usr/lib/python2.7/dist-packages/cumulus*.egg-info/*
1
+debian/cumulus-ml2-driver/usr/lib/python2.7/dist-packages/cumulus_ml2/mech_driver/*.py
2
+debian/cumulus-ml2-driver/usr/lib/python2.7/dist-packages/cumulus_ml2/utils/*.py
3
+debian/cumulus-ml2-driver/usr/lib/python2.7/dist-packages/cumulus*.egg-info/*

+ 3
- 6
debian/rules View File

@@ -26,7 +26,7 @@ endif
26 26
 override_dh_auto_install:
27 27
 	set -e && for pyvers in $(shell pyversions -r); do \
28 28
 		$$pyvers setup.py install --install-layout=deb \
29
-		--root $(CURDIR)/debian/cumulus-ml2; \
29
+		--root $(CURDIR)/debian/cumulus-ml2-driver; \
30 30
 	done
31 31
 
32 32
 override_dh_clean:
@@ -34,12 +34,9 @@ override_dh_clean:
34 34
 	rm -rf build __pycache__
35 35
 	rm -rf *.egg-info
36 36
 
37
-override_dh_installinit:
38
-	dh_installinit --name=cumulus-ml2
39
-
40 37
 override_dh_systemd_enable:
41
-	dh_systemd_enable --no-enable --name=cumulus-ml2
38
+	dh_systemd_enable --no-enable
42 39
 
43 40
 override_dh_systemd_start:
44
-	dh_systemd_start --no-start --name=cumulus-ml2
41
+	dh_systemd_start --no-start
45 42
 

+ 1
- 2
rpm/SPECS/cumulus.spec View File

@@ -32,10 +32,9 @@ weakness of plugin for future development and improvement.
32 32
 
33 33
 ## Usage
34 34
 
35
-There are two components involved in this project:
35
+The component involved in this project:
36 36
 
37 37
 * ML2 mechanism driver (runs on hosts with Neutron server)
38
-* HTTP API server (runs on switches)
39 38
 
40 39
 ## Requirements
41 40
   Openstack Kilo Release. Does not work with Juno or Older releases

+ 4
- 1
setup.cfg View File

@@ -1,6 +1,6 @@
1 1
 [metadata]
2 2
 name = cumulus-ml2
3
-version = 0.1
3
+version = 1.0.0-cl3u1
4 4
 description-file =
5 5
 	README.md
6 6
 
@@ -8,6 +8,9 @@ description-file =
8 8
 packages =
9 9
 	cumulus_ml2
10 10
 
11
+data_files = 
12
+	/etc/neutron/plugins/ml2/ml2_cumulus.ini = etc/neutron/plugins/ml2/ml2_cumulus.ini
13
+
11 14
 [entry_points]
12 15
 neutron.ml2.mechanism_drivers =
13 16
 	cumulus = cumulus_ml2.mech_driver.driver:CumulusMechanismDriver

Loading…
Cancel
Save