diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-06-23 08:29:52 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-06-23 08:29:52 +0000 |
commit | f3af47e6a15aa5bd9c54f5a5097d9f0955417bff (patch) | |
tree | dc7689855cc3a2e8c34b646ca22c604df6bbbbda /manifests/profile/base/ceph | |
parent | a3f22cf461320abb0212d67b4f256cb9228bd32d (diff) | |
parent | c7a275154ab7d352f3001f4c9824cf4374ae99bd (diff) |
Merge "Add Ceph profiles"
Diffstat (limited to 'manifests/profile/base/ceph')
-rw-r--r-- | manifests/profile/base/ceph/client.pp | 35 | ||||
-rw-r--r-- | manifests/profile/base/ceph/mon.pp | 48 | ||||
-rw-r--r-- | manifests/profile/base/ceph/osd.pp | 54 |
3 files changed, 137 insertions, 0 deletions
diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp new file mode 100644 index 0000000..851324a --- /dev/null +++ b/manifests/profile/base/ceph/client.pp @@ -0,0 +1,35 @@ +# Copyright 2016 Red Hat, Inc. +# +# 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::profile::base::ceph::client +# +# Ceph client profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::ceph::client ( + $step = hiera('step'), +) { + + include ::tripleo::profile::base::ceph + + if $step >= 2 { + include ::ceph::profile::client + } +} diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp new file mode 100644 index 0000000..48c3721 --- /dev/null +++ b/manifests/profile/base/ceph/mon.pp @@ -0,0 +1,48 @@ +# Copyright 2016 Red Hat, Inc. +# +# 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::profile::base::ceph::mon +# +# Ceph Monitor profile for tripleo +# +# === Parameters +# +# [*ceph_pools*] +# (Optional) List of pools to create +# Defaults to [] +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::ceph::mon ( + $ceph_pools = [], + $step = hiera('step'), +) { + + include ::tripleo::profile::base::ceph + + if $step >= 2 { + include ::ceph::profile::mon + } + + if $step >= 4 { + ceph::pool { $ceph_pools : + pg_num => hiera('ceph::profile::params::osd_pool_default_pg_num'), + pgp_num => hiera('ceph::profile::params::osd_pool_default_pgp_num'), + size => hiera('ceph::profile::params::osd_pool_default_size'), + } + } +} diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp new file mode 100644 index 0000000..d0c77e9 --- /dev/null +++ b/manifests/profile/base/ceph/osd.pp @@ -0,0 +1,54 @@ +# Copyright 2016 Red Hat, Inc. +# +# 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::profile::base::ceph::osd +# +# Ceph OSD profile for tripleo +# +# === Parameters +# +# [*ceph_osd_selinux_permissive*] +# (Optional) Wheter to configure SELinux in permissive mode +# Default to true +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::ceph::osd ( + $ceph_osd_selinux_permissive = true, + $step = hiera('step'), +) { + + include ::tripleo::profile::base::ceph + + if $step >= 2 { + if $ceph_osd_selinux_permissive { + 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'], + } + + exec { 'set selinux to permissive': + command => 'setenforce 0', + onlyif => "which setenforce && getenforce | grep -i 'enforcing'", + path => ['/usr/bin', '/usr/sbin'], + } -> Class['ceph::profile::osd'] + } + + include ::ceph::profile::osd + } +} |