diff options
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_cephstorage.pp | 35 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 8 |
2 files changed, 43 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp new file mode 100644 index 00000000..c0f19e23 --- /dev/null +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -0,0 +1,35 @@ +# Copyright 2015 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. + +if !str2bool(hiera('enable_package_install', 'false')) { + case $::osfamily { + 'RedHat': { + Package { provider => 'norpm' } # provided by tripleo-puppet + } + default: { + warning('enable_package_install option not supported.') + } + } +} + +if count(hiera('ntp::servers')) > 0 { + include ::ntp +} + +class { 'ceph::profile::params': + mon_initial_members => downcase(hiera('ceph_mon_initial_members')) +} +include ::ceph::profile::client +include ::ceph::profile::osd
\ No newline at end of file diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 2e83b8c3..23e8adf0 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -150,6 +150,14 @@ if hiera('step') >= 1 { # pre-install swift here so we can build rings include ::swift + # don't install Ceph if FSID is not provided + if hiera('ceph::profile::params::fsid', false) { + class { 'ceph::profile::params': + mon_initial_members => downcase(hiera('ceph_mon_initial_members')) + } + include ::ceph::profile::mon + } + } #END STEP 1 if hiera('step') >= 2 { |