From 45783d1c643b7a47454207b3a90575f1ed8ab46d Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 14 Oct 2016 10:15:01 -0400
Subject: packages: run upgrade at 'setup' stage

Instead of using an operator to make sure we upgrade package before any
service, which causes dependency cycles with iptables puppet module,
let's do another approach where we upgrade rpms in the 'setup' stage,
which is a stage that runs before configure and running services.

In that way, we'll remove dependency cycles and make sure packages are
upgrades before configure and running TripleO services.

Change-Id: I1be83f88be1959885c980ab4f428477d412751f7
---
 manifests/packages/upgrades.pp | 43 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 manifests/packages/upgrades.pp

(limited to 'manifests/packages')

diff --git a/manifests/packages/upgrades.pp b/manifests/packages/upgrades.pp
new file mode 100644
index 0000000..a6ca1c8
--- /dev/null
+++ b/manifests/packages/upgrades.pp
@@ -0,0 +1,43 @@
+# Copyright 2016 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# == Class: tripleo::packages::upgrades
+#
+# Upgrade packages using yum.
+#
+class tripleo::packages::upgrades {
+
+  # required for stages
+  include ::stdlib
+
+  case $::osfamily {
+    'RedHat': {
+      $pkg_upgrade_cmd = 'yum -y update'
+    }
+    default: {
+      fail('Please specify a package upgrade command for distribution.')
+    }
+  }
+
+  # Running the package upgrade before managing Services in the main stage.
+  # So we're sure that services will be able to restart with the new version
+  # of the package.
+  ensure_resource('exec', 'package-upgrade', {
+    'command' => $pkg_upgrade_cmd,
+    'path'    => '/usr/bin',
+    'timeout' => 0,
+  })
+
+}
-- 
cgit 1.2.3-korg