Page MenuHomePhabricator

update puppetdb and puppet-master packages to be compatible with puppet5
Closed, ResolvedPublic0 Estimated Story Points

Description

We are currently updating puppet-agent and facter across the feat however for now we are keeping puppet-master and puppet-db on version 4 however we would still like to upgrade the client tools. The current packages for the puppet-master, puppet-master-passanger and puppetdb depended on version lower then the version we would like to use. As such we need to rebuild and test the aforementioned packages running with puppet 5.5.10-2

Event Timeline

jbond triaged this task as Medium priority.May 9 2019, 12:37 PM
jbond created this task.

An updated puppetdb package has been built on boron with the folllowing diff:

diff -Nru puppetdb-4.4.0/debian/changelog puppetdb-4.4.0/debian/changelog
--- puppetdb-4.4.0/debian/changelog     2018-02-05 16:12:48.000000000 +0000
+++ puppetdb-4.4.0/debian/changelog     2019-05-09 11:54:14.000000000 +0000
@@ -1,3 +1,11 @@
+puppetdb (4.4.0-1~wmf2) stretch-wikimedia; urgency=medium
+
+  * Drop the (<< 5.0.0-1puppetlabs1) dependency on puppet, we're moving
+    to v5 now, also clean up the alternate dependencies on puppet-agent,
+    this name isn't used in the Debian packages that we use
+
+ -- Moritz Muehlenhoff <moritz@wikimedia.org>  Thu, 09 May 2019 11:54:14 +0000
+
 puppetdb (4.4.0-1~wmf1) stretch-wikimedia; urgency=medium
 
   * WMF port from jessie to stretch
diff -Nru puppetdb-4.4.0/debian/control puppetdb-4.4.0/debian/control
--- puppetdb-4.4.0/debian/control       2018-02-05 16:12:48.000000000 +0000
+++ puppetdb-4.4.0/debian/control       2019-05-09 11:54:14.000000000 +0000
@@ -11,9 +11,7 @@
 # net-tools is required for netstat usage in service unit file
 # See: https://tickets.puppetlabs.com/browse/SERVER-338
 # procps is required for pgrep, used in several of the init scripts
-Depends: ${misc:Depends}, openjdk-7-jre-headless | openjdk-8-jre-headless, net-tools, adduser, procps, puppet (>= 3.8.1-1puppetlabs1)  | puppet-agent, puppet (<< 5.0.0-1puppetlabs1) | puppet-agent
-Replaces: 
-Conflicts: 
+Depends: ${misc:Depends}, openjdk-7-jre-headless | openjdk-8-jre-headless, net-tools, adduser, procps, puppet
 Description: Puppet Labs puppetdb
  Contains: Puppet-integrated catalog and fact storage (clojure 1.8.0,puppetdb 4.4.0,trapperkeeper-webserver-jetty9 1.7.0)

I found the second bug which made update uninstall the puppetmaster packages on puppetmaster2001: "puppet-master-passenger" and "puppet-master" depend on the exact version (=4.8.2-5) of "puppet", I'll build updated packages of src:puppet for further testing.

I found the second bug which made update uninstall the puppetmaster packages on puppetmaster2001: "puppet-master-passenger" and "puppet-master" depend on the exact version (=4.8.2-5) of "puppet", I'll build updated packages of src:puppet for further testing.

diff -Nru puppet-4.8.2/debian/changelog puppet-4.8.2/debian/changelog
--- puppet-4.8.2/debian/changelog       2017-05-23 20:17:46.000000000 +0000
+++ puppet-4.8.2/debian/changelog       2019-05-09 13:22:37.000000000 +0000
@@ -1,3 +1,12 @@
+puppet (4.8.2-5+wmf1) stretch-wikimedia; urgency=medium
+
+  * Don't make the puppet-master and puppet-master-passenger binary packages
+    depend on (= ${source:Version}), we're migrating the Puppet clients to v5
+    first and the puppet masters in a subsequent step (the client package for
+    v5 are built in a separate component) T219803
+
+ -- Moritz Muehlenhoff <moritz@wikimedia.org>  Thu, 09 May 2019 13:22:37 +0000
+
 puppet (4.8.2-5) unstable; urgency=high
 
   * master: accept facts only in PSON format (CVE-2017-2295) (Closes:
diff -Nru puppet-4.8.2/debian/control puppet-4.8.2/debian/control
--- puppet-4.8.2/debian/control 2017-05-11 14:43:03.000000000 +0000
+++ puppet-4.8.2/debian/control 2019-05-09 13:22:37.000000000 +0000
@@ -56,7 +56,7 @@
 Package: puppet-master
 Architecture: all
 Depends: ${misc:Depends},
- puppet (= ${source:Version}),
+ puppet,
  ruby | ruby-interpreter,
  lsb-base (>= 3.0-6),
 Breaks: puppetmaster (<< 4.8.1-3)
@@ -85,7 +85,7 @@
  apache2,
  libapache2-mod-passenger,
  lsb-base,
- puppet (= ${source:Version}),
+ puppet,
  ruby | ruby-interpreter,
 Breaks: puppetmaster-passenger (<< 4.4.0-1)
 Replaces: puppetmaster-passenger (<< 4.4.0-1)