From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 11 Jul 2016 10:12:34 +0000 (+0200)
Subject: Configure Ceph/OSD after Ceph/Mon when on same node
X-Git-Tag: opnfv-6.0.0~646^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=443ea32a1128ccefed69802e0c8e47bf5092b7c6;p=apex-puppet-tripleo.git

Configure Ceph/OSD after Ceph/Mon when on same node

When both the Ceph Monitor and OSD roles are deployed on the same
node, we need the OSD configuration to happen *after* the Monitor
configuration is finished.

Change-Id: Id2ea099a0aaba344004870e82108da288cba2cb7
---

diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp
index a9224d3..9736656 100644
--- a/manifests/profile/base/ceph/osd.pp
+++ b/manifests/profile/base/ceph/osd.pp
@@ -34,7 +34,7 @@ class tripleo::profile::base::ceph::osd (
 
   include ::tripleo::profile::base::ceph
 
-  if $step >= 2 {
+  if $step >= 3 {
     if $ceph_osd_selinux_permissive {
       exec { 'set selinux to permissive on boot':
         command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config",