From af553c45d7c035a70fa8c972657b0f8f5e8d86b8 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 16 May 2019 17:23:33 +1000
Subject: [PATCH] ask.o.o : workaround old puppet-solr package

puppet-solr is dead upstream.  Even the un-merged pull request for
Xenial support isn't sufficient [1].

We can either get into the business of owning puppet-solr, or hack
around it.  It seems the major difference is that jetty package split
into separate jetty[8|9] packages, and puppet-solr just uses "jetty"
everywhere.

This deb, created by equivs does the following

 * pre-depends on jetty8
 * installs a symlink /etc/init.d/jetty -> jetty8
 * symlinks in the webserver directory to /usr/share/jetty

This appears to be enough to get things going.  By pre-installing it,
puppet-solr is happy enough to go on...

[1] https://github.com/vamsee/puppet-solr/pull/33

Change-Id: Ie86303caeb26634434dc4b2d0d3f1195749a277e
---
 .../files/ask/jetty_1.0_all.deb               | Bin 0 -> 2268 bytes
 modules/openstack_project/manifests/ask.pp    |  23 ++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 modules/openstack_project/files/ask/jetty_1.0_all.deb

diff --git a/modules/openstack_project/files/ask/jetty_1.0_all.deb b/modules/openstack_project/files/ask/jetty_1.0_all.deb
new file mode 100644
index 0000000000000000000000000000000000000000..15d9e6af8533760644d887cd5701a03319707685
GIT binary patch
literal 2268
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
CyChox

literal 0
HcmV?d00001

diff --git a/modules/openstack_project/manifests/ask.pp b/modules/openstack_project/manifests/ask.pp
index a42e9ce624..a295e79243 100644
--- a/modules/openstack_project/manifests/ask.pp
+++ b/modules/openstack_project/manifests/ask.pp
@@ -17,6 +17,29 @@ class openstack_project::ask (
   $askbot_revision              = '87086ebcefc5be29e80d3228e465e6bec4523fcf'
 ) {
 
+  if $::lsbdistcodename == "xenial" {
+    # NOTE(ianw) This is a horrible, horrible hack because puppet-solr
+    # has not been updated to handle Xenial where jetty split into a
+    # jetty8 package.  This equivs deb pre-depends on jetty8, and sets
+    # up a few links to fool (confuse?) puppet-solr enough to install
+    # and run...
+    file { '/root/jetty_1.0_all.deb':
+      ensure => present,
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0644',
+      source => 'puppet://modules/openstack_project/ask/jetty_1.0_all.deb'
+    }
+
+    package { 'jetty':
+      provider => dpkg,
+      state    => installed,
+      source   => "/root/jetty_1.0_all.deb",
+      require  => File['/root/jetty_1.0_all.deb']
+    }
+
+  }
+
   file { '/srv/dist':
     ensure => directory,
     owner  => 'root',