09c5ff76f3
In tripleo-heat-templates a new 'CephConfigPath' parameter is introduced with the purpose of customizing the path where the Ceph config and keyring files are created on the host. This change makes sure that puppet-tripleo is able to consume a custom location for the Ceph config and keyring files. Closes-Bug: #1708302 Co-Authored-By: Giulio Fidente <gfidente@redhat.com> Change-Id: Iaabb66cd26f0246defe391a4e34f4eab3c3c5fee
67 lines
2.6 KiB
Puppet
67 lines
2.6 KiB
Puppet
# 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::nova::compute_libvirt_shared
|
|
#
|
|
# Libvirt profile for tripleo. It will deploy Libvirt service and configure it.
|
|
#
|
|
# === Parameters
|
|
#
|
|
# [*nova_rbd_client_name*]
|
|
# (optional) name of RBD client
|
|
# defaults to hiera('nova::compute::rbd::libvirt_rbd_user')
|
|
#
|
|
# [*nova_rbd_ceph_conf_path*]
|
|
# (Optional) The path where the Ceph Cluster config files are stored on the host
|
|
# defaults to '/etc/ceph'
|
|
#
|
|
# [*step*]
|
|
# (Optional) The current step in deployment. See tripleo-heat-templates
|
|
# for more details.
|
|
# Defaults to hiera('step')
|
|
#
|
|
class tripleo::profile::base::nova::compute_libvirt_shared (
|
|
$nova_rbd_client_name = hiera('nova::compute::rbd::libvirt_rbd_user','openstack'),
|
|
$nova_rbd_ceph_conf_path = '/etc/ceph',
|
|
$step = Integer(hiera('step')),
|
|
) {
|
|
if $step >= 4 {
|
|
# Ceph + Libvirt
|
|
$rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
|
|
$rbd_persistent_storage = hiera('rbd_persistent_storage', false)
|
|
if $rbd_ephemeral_storage or $rbd_persistent_storage {
|
|
include nova::compute::rbd
|
|
exec{ "exec-setfacl-${nova_rbd_client_name}-nova":
|
|
path => ['/bin', '/usr/bin'],
|
|
command => "setfacl -m u:nova:r-- ${nova_rbd_ceph_conf_path}/ceph.client.${nova_rbd_client_name}.keyring",
|
|
unless => "getfacl ${nova_rbd_ceph_conf_path}/ceph.client.${nova_rbd_client_name}.keyring | grep -q user:nova:r--",
|
|
}
|
|
-> exec{ "exec-setfacl-${nova_rbd_client_name}-nova-mask":
|
|
path => ['/bin', '/usr/bin'],
|
|
command => "setfacl -m m::r ${nova_rbd_ceph_conf_path}/ceph.client.${nova_rbd_client_name}.keyring",
|
|
unless => "getfacl ${nova_rbd_ceph_conf_path}/ceph.client.${nova_rbd_client_name}.keyring | grep -q mask::r",
|
|
}
|
|
}
|
|
|
|
if $rbd_ephemeral_storage {
|
|
class { 'nova::compute::libvirt':
|
|
libvirt_disk_cachemodes => ['network=writeback'],
|
|
libvirt_hw_disk_discard => 'unmap',
|
|
}
|
|
} else {
|
|
include nova::compute::libvirt
|
|
}
|
|
}
|
|
}
|