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 6c5dda4..fd7faff 100644 (file)
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -13,29 +13,44 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-include tripleo::packages
+include ::tripleo::packages
+include ::tripleo::firewall
 
+create_resources(kmod::load, hiera('kernel_modules'), {})
 create_resources(sysctl::value, hiera('sysctl_settings'), {})
+Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
 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",
     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']
 }
 
+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
 
 hiera_include('ceph_classes')
+package_manifest{'/var/lib/tripleo/installed-packages/overcloud_ceph': ensure => present}