From c04c0c5c412721615b8098746532f3edea89a713 Mon Sep 17 00:00:00 2001 From: Amudha Date: Sun, 17 Jul 2016 23:25:17 -0700 Subject: [PATCH] Adding python-memcache to contrail-openstack-config dependency contrail-config uses keystonemiddleware to authenticate with keystone. keystonemiddleware has a dependency on memcache, but the dependency is not defined in the upstream keystonemiddleware package. Adding the dependency in contrail-openstack-config as the config node needs memcache installed while using keystonemiddleware. Change-Id: Ibd6d24cfb1e6b013078bd383f162a5b1449d60ca Closes-Bug: #1602618 --- .../contrail-openstack-config/debian/control.kilo.in | 4 +++- .../contrail-openstack-config/debian/control.liberty.in | 4 +++- .../contrail-openstack-config/debian/control.mitaka.in | 9 ++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/common/debian/contrail-openstack-config/debian/control.kilo.in b/common/debian/contrail-openstack-config/debian/control.kilo.in index a11eab5ae..8c20cef56 100644 --- a/common/debian/contrail-openstack-config/debian/control.kilo.in +++ b/common/debian/contrail-openstack-config/debian/control.kilo.in @@ -30,5 +30,7 @@ Depends: ifmap-server, ifmap-python-client, contrail-config-openstack, - keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1) + keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1), + memcached, + python-memcache Description: Contrail Openstack Config composite debian package diff --git a/common/debian/contrail-openstack-config/debian/control.liberty.in b/common/debian/contrail-openstack-config/debian/control.liberty.in index a11eab5ae..8c20cef56 100644 --- a/common/debian/contrail-openstack-config/debian/control.liberty.in +++ b/common/debian/contrail-openstack-config/debian/control.liberty.in @@ -30,5 +30,7 @@ Depends: ifmap-server, ifmap-python-client, contrail-config-openstack, - keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1) + keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1), + memcached, + python-memcache Description: Contrail Openstack Config composite debian package diff --git a/common/debian/contrail-openstack-config/debian/control.mitaka.in b/common/debian/contrail-openstack-config/debian/control.mitaka.in index a11eab5ae..51b8136e6 100644 --- a/common/debian/contrail-openstack-config/debian/control.mitaka.in +++ b/common/debian/contrail-openstack-config/debian/control.mitaka.in @@ -30,5 +30,12 @@ Depends: ifmap-server, ifmap-python-client, contrail-config-openstack, - keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1) + keepalived (>=1.2.13-1) | keepalived (>=1.2.13-0~276~ubuntu14.04.1), +#contrail-config uses keystonemiddleware to authenticate with keystone. +#keystonemiddleware has a dependency on memcache, but the dependency is +#not defined in the upstream keystonemiddleware package. +#Adding the dependency in contrail-openstack-config as the config node +#needs memcache installed while using keystonemiddleware. + memcached, + python-memcache Description: Contrail Openstack Config composite debian package