Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
deployment: drop step6
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_cephstorage.pp
diff --git
a/puppet/manifests/overcloud_cephstorage.pp
b/puppet/manifests/overcloud_cephstorage.pp
index
51f5e88
..
fd7faff
100644
(file)
--- a/
puppet/manifests/overcloud_cephstorage.pp
+++ b/
puppet/manifests/overcloud_cephstorage.pp
@@
-14,13
+14,18
@@
# under the License.
include ::tripleo::packages
# under the License.
include ::tripleo::packages
+include ::tripleo::firewall
+create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
+Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
if count(hiera('ntp::servers')) > 0 {
include ::ntp
}
if count(hiera('ntp::servers')) > 0 {
include ::ntp
}
+include ::timezone
+
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",
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",
@@
-35,6
+40,15
@@
if str2bool(hiera('ceph_osd_selinux_permissive', true)) {
} -> Class['ceph::profile::osd']
}
} -> Class['ceph::profile::osd']
}
+if str2bool(hiera('ceph_ipv6', false)) {
+ $mon_host = hiera('ceph_mon_host_v6')
+} else {
+ $mon_host = hiera('ceph_mon_host')
+}
+class { '::ceph::profile::params':
+ mon_host => $mon_host,
+}
+include ::ceph::conf
include ::ceph::profile::client
include ::ceph::profile::osd
include ::ceph::profile::client
include ::ceph::profile::osd