From 926bf44fe65d45d82fb281713877496f378f9796 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 28 Feb 2013 12:47:37 -0500
Subject: [PATCH] RHEL support for salt.

Updates to the salt modules so that they run on RHEL.

Change-Id: Ibdbc35594a018a7f49f3785d527e5c1a71a92a2e
Reviewed-on: https://review.openstack.org/23188
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Khai Do <zaro0508@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/salt/manifests/init.pp   | 27 ++++++++++++++++-----------
 modules/salt/manifests/master.pp | 27 ++++++++++++++++-----------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/modules/salt/manifests/init.pp b/modules/salt/manifests/init.pp
index 64449a80ec..13523b642b 100644
--- a/modules/salt/manifests/init.pp
+++ b/modules/salt/manifests/init.pp
@@ -3,23 +3,28 @@
 class salt (
   $salt_master = $::fqdn
 ) {
-  include apt
 
-  # Wrap in ! defined checks to allow minion and master installs on the
-  # same host.
-  if ! defined(Apt::Ppa['ppa:saltstack/salt']) {
-    apt::ppa { 'ppa:saltstack/salt': }
-  }
+  if ($::operatingsystem == 'Ubuntu') {
+    include apt
 
-  if ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties':
-      ensure => present,
+    # Wrap in ! defined checks to allow minion and master installs on the
+    # same host.
+    if ! defined(Apt::Ppa['ppa:saltstack/salt']) {
+      apt::ppa { 'ppa:saltstack/salt': }
     }
+
+    if ! defined(Package['python-software-properties']) {
+      package { 'python-software-properties':
+        ensure => present,
+      }
+    }
+
+    Apt::Ppa['ppa:saltstack/salt'] -> Package['salt-minion']
+
   }
 
   package { 'salt-minion':
-    ensure  => present,
-    require => Apt::Ppa['ppa:saltstack/salt'],
+    ensure  => present
   }
 
   file { '/etc/salt/minion':
diff --git a/modules/salt/manifests/master.pp b/modules/salt/manifests/master.pp
index a87948bf68..c01c76fc66 100644
--- a/modules/salt/manifests/master.pp
+++ b/modules/salt/manifests/master.pp
@@ -1,23 +1,28 @@
 # Class salt::master
 #
 class salt::master {
-  include apt
 
-  # Wrap in ! defined checks to allow minion and master installs on the
-  # same host.
-  if ! defined(Apt::Ppa['ppa:saltstack/salt']) {
-    apt::ppa { 'ppa:saltstack/salt': }
-  }
+  if ($::operatingsystem == 'Ubuntu') {
+    include apt
 
-  if ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties':
-      ensure => present,
+    # Wrap in ! defined checks to allow minion and master installs on the
+    # same host.
+    if ! defined(Apt::Ppa['ppa:saltstack/salt']) {
+      apt::ppa { 'ppa:saltstack/salt': }
     }
+
+    if ! defined(Package['python-software-properties']) {
+      package { 'python-software-properties':
+        ensure => present,
+      }
+    }
+
+    Apt::Ppa['ppa:saltstack/salt'] -> Package['salt-master']
+
   }
 
   package { 'salt-master':
-    ensure  => present,
-    require => Apt::Ppa['ppa:saltstack/salt'],
+    ensure  => present
   }
 
   group { 'salt':