From 609d5eb061a908a0a749030dce45dae4b14a2007 Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jschluet@redhat.com>
Date: Thu, 21 Feb 2019 19:06:35 -0500
Subject: [PATCH] drop msgpack now that kolla has dropped it as well

kolla dropped references to msgpack Id2706b3b38e57daf1166f98a59dc3ecd30fd4fa7
we can also drop references to msgpack once kolla is included in promotion

Change-Id: I27449ff4cf71b66de0d09132baee219135e7a883
---
 container-images/tripleo_kolla_template_overrides.j2 | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index c70417010..db4e0833f 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -167,11 +167,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     'python3-vitrageclient',
 ] %}
 {% else %}
-{#
-   'python2-msgpack' # EPEL, RDO is python-msgpack
-#}
 {% set openstack_base_packages_remove = [
-    'python2-msgpack',
     'python-cloudkittyclient',
     'python-magnumclient',
     'python-muranoclient',
@@ -179,12 +175,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     'python-vitrageclient',
 ] %}
 {% endif %}
-# Pick up the proper packages for python2-msgpack
-{% if distro_python3 %}
-{% set openstack_base_packages_append = ['python3-msgpack', 'openstack-selinux'] %}
-{% else %}
-{% set openstack_base_packages_append = ['python-msgpack', 'openstack-selinux'] %}
-{% endif %}
+{% set openstack_base_packages_append = ['openstack-selinux'] %}
 
 # Use mariadb-server-galera and xinetd for galera and clustercheck
 {#  'pv'                  # EPEL