Additional packaging and provisioning changes for liberty on mainline

Bringing in the changes done on R3.0 into mainline https://review.opencontrail.org/#/c/18699 - #1561163 https://review.opencontrail.org/#/c/18837 - #1561163 https://review.opencontrail.org/#/c/18864 - #1547784 https://review.opencontrail.org/#/c/18871 - #1561163 https://review.opencontrail.org/#/c/18907 - #1564023 https://review.opencontrail.org/#/c/18928 - #1564221 Partial-Bug: #1547784 Change-Id: If584ae644ec39a11b81e3f626374f697bb737f82
Juniper · Mar 31, 2016 · b8a6c4c · b8a6c4c
1 parent dda818e
commit b8a6c4c
Show file tree

Hide file tree

Showing 113 changed files with 4,630 additions and 71 deletions.
diff --git a/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg b/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg
@@ -40,7 +40,7 @@ package_type  = contrail-install-packages, contrail-packages
 [contrail]
 pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-nova-driver, contrail-vrouter-agent, contrail-vrouter-dkms,
-          contrail-vrouter-source,
+          contrail-vrouter-dpdk, contrail-vrouter-source,
           contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
           contrail-vrouter-3.13.0-40-generic, contrail-config-openstack,
           contrail-dns, python-opencontrail-vrouter-netns, contrail-utils,
@@ -61,6 +61,10 @@ makeloc   = tools/packaging/common/debian
 pkgs      = contrail-vrouter-common
 makeloc   = tools/packaging/common/debian
 
+[contrail-vrouter-dpdk-init-deb]
+pkgs      = contrail-vrouter-dpdk-init
+makeloc   = tools/packaging/common/debian
+
 [contrail-web-core-deb]
 pkgs      = contrail-web-core
 makeloc   = tools/packaging/common/debian
@@ -153,8 +157,8 @@ builtloc  = build/debian/
 
 # Virtual Target; Just picks up already built packages
 [vrouter-openstack-extra]
-#pkgs          = nova-common, nova-compute, nova-compute-kvm,
-#                nova-compute-libvirt, python-nova
+pkgs          = nova-common, nova-compute, nova-compute-kvm,
+                nova-compute-libvirt, python-nova
 package_type  = vrouter-openstack-extra
 builtloc      = build/openstack
 target        =
@@ -175,14 +179,14 @@ target        =
 sub_package_type = contrail-packages, vrouter-openstack-extra, cfgm-openstack-extra,
                    contrail-thirdparty-packages, contrail-dependent-packages
 
-#[openstack-nova-deb]
-#pkgs      = nova-api, nova-cells, nova-common, nova-compute,
-#            nova-compute-kvm, nova-conductor, nova-console,
-#            nova-consoleauth, nova-novncproxy, nova-objectstore,
-#            nova-scheduler, nova-compute-libvirt, python-nova
-#makeloc   = tools/packaging/openstack/debian
-#builtloc  = build/openstack
-#package_type  = contrail-install-packages, contrail-openstack-packages
+[openstack-nova-deb]
+pkgs      = nova-api, nova-cells, nova-common, nova-compute,
+            nova-compute-kvm, nova-conductor, nova-console,
+            nova-consoleauth, nova-novncproxy, nova-objectstore,
+            nova-scheduler, nova-compute-libvirt, python-nova
+makeloc   = tools/packaging/openstack/debian
+builtloc  = build/openstack
+package_type  = contrail-install-packages, contrail-openstack-packages
 
 [contrail-openstack-ha-deb]
 pkgs      = contrail-openstack-ha

diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg
@@ -108,6 +108,10 @@ file           = dnsmasq-base_2.68-1ubuntu0.1_amd64.deb
 md5            = aaee558be8eddbbdc86bb0623152786d
 source         = repo:trusty-security/main
 
+[dpdk-depends-packages_14.04-contrail6]
+file  = dpdk-depends-packages_14.04-contrail6_amd64.deb
+md5   = 7740d91aaf564d93c473e90a6b540346
+
 [ebtables_2.0.10.4-3ubuntu1]
 file           = ebtables_2.0.10.4-3ubuntu1_amd64.deb
 md5            = f96583701c00105823f3f47dea83d916
@@ -403,6 +407,11 @@ file           = libusbredirparser1_0.6-2ubuntu1.1_amd64.deb
 md5            = 60574ac64168133bd8a974d58b7e9c5e
 source         = repo:trusty-updates/main
 
+[liburcu2_0.8.7-2~cloud2]
+file           = liburcu2_0.8.7-2~cloud2_amd64.deb 
+md5            = b42cd89fcfd0b4bbf84bd38c3f3ea2ef
+source         = repo:trusty-updates-liberty
+
 [libvirt-bin_1.2.16-2ubuntu11~cloud0]
 file           = libvirt-bin_1.2.16-2ubuntu11~cloud0_amd64.deb
 md5            = d306b1a7cf3d46b349d4c08c8202dfa5
@@ -768,21 +777,6 @@ file           = nfs-kernel-server_1%%3a1.2.8-6ubuntu1.2_amd64.deb
 md5            = 84e9549cb2263fe0433bbc862fb4efc7
 source         = repo:trusty-updates/main
 
-[nova-compute-kvm_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-compute-kvm_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 1e66ddba54f94cbf9d5bfb79ebe78b9c
-source         = repo:trusty-updates-liberty/main
-
-[nova-compute-libvirt_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-compute-libvirt_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = ae1eec0691a03e3d7fd5dbfb05f9d271
-source         = repo:trusty-updates-liberty/main
-
-[nova-compute_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-compute_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 141850f52aefb5321b47c572c8ab843b
-source         = repo:trusty-updates-liberty/main
-
 [open-iscsi_2.0.873-3ubuntu9]
 file           = open-iscsi_2.0.873-3ubuntu9_amd64.deb
 md5            = baa821890ea97d60e291c87d2dc439ae

diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_openstack_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_openstack_packages.cfg
@@ -87,6 +87,7 @@ source         = repo:trusty-updates-liberty/main/
 file           = ceilometer-agent-compute_1%%3a5.0.2-0ubuntu1~cloud0_all.deb
 md5            = 250d76c1775e2e6f5fdbe47362580ff7
 source         = repo:trusty-updates-liberty/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [ceilometer-agent-notification_1:5.0.2-0ubuntu1~cloud0]
 file           = ceilometer-agent-notification_1%%3a5.0.2-0ubuntu1~cloud0_all.deb
@@ -117,6 +118,7 @@ source         = repo:trusty-updates-liberty/main/
 file           = ceilometer-common_1%%3a5.0.2-0ubuntu1~cloud0_all.deb
 md5            = 24baa6f5e4b49292a8f9a4b999ed6c72
 source         = repo:trusty-updates-liberty/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [cinder-api_2:7.0.0-0ubuntu1.15.10.1~cloud0]
 file           = cinder-api_2%%3a7.0.0-0ubuntu1.15.10.1~cloud0_all.deb
@@ -568,46 +570,6 @@ file           = nfs-common_1%%3a1.2.8-6ubuntu1.2_amd64.deb
 md5            = 64d83aabb28de942a6e367181ed580ca
 source         = repo:trusty-updates/main
 
-[nova-api_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-api_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 572632d443686850b2c4fefa9790f365
-source         = repo:trusty-updates-liberty/main
-
-[nova-common_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-common_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 047e8698c56b8650474369dbe3c24968
-source         = repo:trusty-updates-liberty/main
-
-[nova-conductor_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-conductor_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 0268735564fa67e02fc6782caad16d68
-source         = repo:trusty-updates-liberty/main
-
-[nova-console_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-console_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 968fda4fe8b386484214c5372b4e674c
-source         = repo:trusty-updates-liberty/main
-
-[nova-consoleauth_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-consoleauth_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 068e701e3e826ffdb8c4ce8381e59d9f
-source         = repo:trusty-updates-liberty/main
-
-[nova-novncproxy_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-novncproxy_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 60d8b9753d18d4ce68741329e9f1c91f
-source         = repo:trusty-updates-liberty/main
-
-[nova-objectstore_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-objectstore_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 7268e0e334b3d1fe888cacf825fe6915
-source         = repo:trusty-updates-liberty/main
-
-[nova-scheduler_2:12.0.0-0ubuntu2~cloud0]
-file           = nova-scheduler_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 4bd7161d52451f9dfc17badd3aabdb78
-source         = repo:trusty-updates-liberty/main
-
 [novnc_1:0.4+dfsg+1+20131010+gitf68af8af3d-2]
 file           = novnc_1%%3a0.4+dfsg+1+20131010+gitf68af8af3d-2_all.deb
 md5            = fae80db8696627b14491879893901708
@@ -702,11 +664,13 @@ source         = repo:trusty-updates-liberty/main
 file           = python-ceilometer_1%%3a5.0.2-0ubuntu1~cloud0_all.deb
 md5            = 73812e2d52c3f4eec1a92bf1f08a480a
 source         = repo:trusty-updates-liberty/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-ceilometerclient_1.5.0-1~cloud0]
 file           = python-ceilometerclient_1.5.0-1~cloud0_all.deb
 md5            = 67590bfe834d4ab532d736fdb2603222
 source         = repo:trusty-updates-liberty/main
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-cffi-backend_1.1.2-1ubuntu2~cloud2]
 file           = python-cffi-backend_1.1.2-1ubuntu2~cloud2_amd64.deb
@@ -727,6 +691,7 @@ source         = repo:trusty-updates-liberty/main
 file           = python-cinderclient_1%%3a1.4.0-2~cloud0_all.deb
 md5            = adc89632692659f58f1a494b1ced379c
 source         = repo:trusty-updates-liberty/main
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-cliff_1.14.0-1ubuntu1~cloud0]
 file           = python-cliff_1.14.0-1ubuntu1~cloud0_all.deb
@@ -897,6 +862,7 @@ source         = repo:trusty-updates-liberty/main
 file           = python-glanceclient_1%%3a1.1.0-0ubuntu1~cloud0_all.deb
 md5            = 9ed4c8dd2ed9419113d3b0a1da08ced9
 source         = repo:trusty-updates-liberty/main
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-gridfs_3.0.3-1~cloud0]
 file           = python-gridfs_3.0.3-1~cloud0_all.deb
@@ -1078,11 +1044,6 @@ file           = python-networkx_1.8.1-0ubuntu3_all.deb
 md5            = e56789bcfefec7b730a35c983670346b
 source         = repo:trusty/main
 
-[python-nova_2:12.0.0-0ubuntu2~cloud0]
-file           = python-nova_2%%3a12.0.0-0ubuntu2~cloud0_all.deb
-md5            = 8622fa88c48a2b9cd628608a6d433264
-source         = repo:trusty-updates-liberty/main
-
 [python-novnc_1:0.4+dfsg+1+20131010+gitf68af8af3d-2]
 file           = python-novnc_1%%3a0.4+dfsg+1+20131010+gitf68af8af3d-2_all.deb
 md5            = 88b3c3af0d2fe9339c37dae213af0d4a
@@ -1448,6 +1409,7 @@ source         = repo:trusty-updates/main
 file           = python-swiftclient_1%%3a2.6.0-1ubuntu1~cloud0_all.deb
 md5            = c8ab0c74c29746c8c7523c48d7b938f7
 source         = repo:trusty-updates-liberty/main
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-tablib_0.9.11-2build1]
 file           = python-tablib_0.9.11-2build1_all.deb

diff --git a/openstack/debian/openstack-nova/liberty/debian/README.Source b/openstack/debian/openstack-nova/liberty/debian/README.Source
@@ -0,0 +1,6 @@
+To do a release to the ubuntu archive:
+
+1. dch --release && debcommit --release
+2. bzr bd -S
+3. dput
+4. Once it has been accepted: bzr push