From 78643e0aaa504284d15e0b8352bbc5723de970d4 Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Christopher Date: Fri, 13 May 2016 15:45:52 -0700 Subject: [PATCH] Packaging nova-docker package with changes to use http based vrouter-port-control script to plug/unplug vif's in the vrouter. This script ensures that port info is persisted in file. Agent reads those files and re-adds port during restarts. Change-Id: I72c77a267662d7d100c09e968d79a8c069c5962f Closes-Bug: 1533037 --- .../icehouse/depends_contrail_dependent_packages.cfg | 10 +++------- .../icehouse/depends_contrail_dependent_packages.cfg | 10 +++------- .../icehouse/depends_contrail_thirdparty_packages.cfg | 4 ++-- .../juno/depends_contrail_dependent_packages.cfg | 10 +++------- .../juno/depends_contrail_thirdparty_packages.cfg | 6 +++--- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/build/package_configs/ubuntu1204/icehouse/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_contrail_dependent_packages.cfg index 2810611cc..49e8e7bf4 100644 --- a/build/package_configs/ubuntu1204/icehouse/depends_contrail_dependent_packages.cfg +++ b/build/package_configs/ubuntu1204/icehouse/depends_contrail_dependent_packages.cfg @@ -1031,13 +1031,9 @@ md5 = ffb76bc7eef80e089e500cba2af113b9 file = lksctp-tools_1.0.11+dfsg-2_amd64.deb md5 = 3629b3235fce3f5081ef3951732a0a11 -[lxc-docker-1.5.0_1.5.0] -file = lxc-docker-1.5.0_1.5.0_amd64.deb -md5 = e29b0a03e0d7eb54bdbbc322e26cad73 - -[lxc-docker_1.5.0] -file = lxc-docker_1.5.0_amd64.deb -md5 = 923cad1a2af2d6b0a3e8fa909ba26ca4 +[lxc-docker-1.6.2] +file = lxc-docker-1.6.2_1.6.2_amd64.deb +md5 = bb24274e604d7ed3ac70de296b594cd1 [makedumpfile_1.3.7-2] file = makedumpfile_1.3.7-2_amd64.deb diff --git a/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg index ab00b0d57..ea23e5565 100644 --- a/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg +++ b/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg @@ -767,13 +767,9 @@ md5 = 2d2793872aa6faf93cce49dd85600b95 file = lksctp-tools_1.0.15+dfsg-1_amd64.deb md5 = 39373482904f27eddebcef56b9bcf13f -[lxc-docker-1.5.0_1.5.0] -file = lxc-docker-1.5.0_1.5.0_amd64.deb -md5 = e29b0a03e0d7eb54bdbbc322e26cad73 - -[lxc-docker_1.5.0] -file = lxc-docker_1.5.0_amd64.deb -md5 = 923cad1a2af2d6b0a3e8fa909ba26ca4 +[lxc-docker-1.6.2] +file = lxc-docker-1.6.2_1.6.2_amd64.deb +md5 = bb24274e604d7ed3ac70de296b594cd1 [makedumpfile_1.5.5-2ubuntu1.1] file = makedumpfile_1.5.5-2ubuntu1.1_amd64.deb diff --git a/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg index 64c170c88..2e8374bd0 100644 --- a/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg @@ -52,8 +52,8 @@ file = nodejs_0.8.15-1contrail1_amd64.deb md5 = 266a7423da197d044000d3e389dd5aff [nova-docker] -file = nova-docker_0.0.0.post124-0contrail0_all.deb -md5 = d29d2a9f3ff8710e89b9a09bd26494d1 +file = nova-docker_0.0.0.post126-0contrail0_all.deb +md5 = 03e05a083e4a2aa0f3aeab10ac4916b8 [python-backports.ssl-match-hostname_3.4.0.2-1contrail1] file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg index 061083dac..b402b5407 100644 --- a/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg +++ b/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg @@ -875,13 +875,9 @@ md5 = 2d2793872aa6faf93cce49dd85600b95 file = lksctp-tools_1.0.15+dfsg-1_amd64.deb md5 = 39373482904f27eddebcef56b9bcf13f -[lxc-docker-1.5.0_1.5.0] -file = lxc-docker-1.5.0_1.5.0_amd64.deb -md5 = e29b0a03e0d7eb54bdbbc322e26cad73 - -[lxc-docker_1.5.0] -file = lxc-docker_1.5.0_amd64.deb -md5 = 923cad1a2af2d6b0a3e8fa909ba26ca4 +[lxc-docker-1.6.2] +file = lxc-docker-1.6.2_1.6.2_amd64.deb +md5 = bb24274e604d7ed3ac70de296b594cd1 [lxc_1.1.0~alpha2-0ubuntu3.1~cloud0] file = lxc_1.1.0~alpha2-0ubuntu3.1~cloud0_amd64.deb diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg index 4c5c4c92c..8da26d219 100644 --- a/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg @@ -51,9 +51,9 @@ md5 = 0f8a72ecdc35e176eae4429df102f903 file = nodejs_0.8.15-1contrail1_amd64.deb md5 = 266a7423da197d044000d3e389dd5aff -[nova-docker] -file = nova-docker_0.0.0.post155-0contrail0_all.deb -md5 = 7339bafc66bd512d2563898e212686fe +[nova-docker_0.0.0.post161-0contrail0_all.deb] +file = nova-docker_0.0.0.post161-0contrail0_all.deb +md5 = 171fb7bdd1bf4c5fd5766af3cda62411 [python-backports.ssl-match-hostname_3.4.0.2-1contrail1] file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb