From bc247565f4a40de57bc970e99740582082c3a68a Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 19 Jul 2017 16:43:12 +0000
Subject: [PATCH] Pin paho-mqtt to 1.2.3 on the puppetmaster

The new paho-mqtt 1.3.0 release brings
https://github.com/eclipse/paho.mqtt.python/commit/0a8cccc which
prevents its use on Ubuntu Trusty's default Python interpreter.
Until we upgrade to a newer Python there, stay on paho-mqtt 1.2.3 so
that the MQTT callback plugin for Ansible will remain functional.

Change-Id: I2d8d5f74a3a8244da226d18365650780d3350d1f
---
 modules/openstack_project/manifests/puppetmaster.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 86b39f2549..d5c4946da3 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -351,9 +351,11 @@ class openstack_project::puppetmaster (
     source => 'puppet:///modules/openstack_project/puppetmaster/expand-groups.sh',
     notify => Exec['expand_groups'],
   }
+  # Temporarily pin paho-mqtt to 1.2.3 since 1.3.0 won't support TLS on
+  # Trusty's Python 2.7.
   if $enable_mqtt {
     package {'paho-mqtt':
-      ensure   => latest,
+      ensure   => '1.2.3',
       provider => openstack_pip,
       require  => Class['pip'],
     }