aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_cephstorage.pp
diff options
context:
space:
mode:
authorGael Chamoulaud <gchamoul@redhat.com>2015-09-21 15:14:27 +0200
committerGael Chamoulaud <gchamoul@redhat.com>2015-11-05 15:52:28 +0100
commitb9aab0951835be1acee0e116b0d679c9af1489f4 (patch)
treea4d98258d8d3ef0ee2b87a9805453a2f4b316f4f /puppet/manifests/overcloud_cephstorage.pp
parent0d6b04c21a8308701416c15c1594d6253d848753 (diff)
Make puppet manifests compliant with Puppet 4.x
- https://docs.puppetlabs.com/puppet/3.8/reference/deprecated_language.html - Temporary disablement of the pupppet-lint autoload layout check failing for ringbuilder.pp. A fix for that will be part of an other patch. Change-Id: I495825641ab12e7c5789c1405649c356c5bb8051 Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
Diffstat (limited to 'puppet/manifests/overcloud_cephstorage.pp')
-rw-r--r--puppet/manifests/overcloud_cephstorage.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index a88ca2d9..51f5e88d 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-include tripleo::packages
+include ::tripleo::packages
create_resources(sysctl::value, hiera('sysctl_settings'), {})
@@ -25,13 +25,13 @@ if str2bool(hiera('ceph_osd_selinux_permissive', true)) {
exec { 'set selinux to permissive on boot':
command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config",
onlyif => "test -f /etc/selinux/config && ! grep '^SELINUX=permissive' /etc/selinux/config",
- path => ["/usr/bin", "/usr/sbin"],
+ path => ['/usr/bin', '/usr/sbin'],
}
exec { 'set selinux to permissive':
- command => "setenforce 0",
+ command => 'setenforce 0',
onlyif => "which setenforce && getenforce | grep -i 'enforcing'",
- path => ["/usr/bin", "/usr/sbin"],
+ path => ['/usr/bin', '/usr/sbin'],
} -> Class['ceph::profile::osd']
}