Fuel@OPNFV rebase due to upstrem changes

[genesis.git] / fuel / build / f_osnaily / puppet / modules / osnailyfacter / examples / site.pp.orig

diff --git a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig
index 940beda..9ed557a 100644 (file)
--- a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig
+++ b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig
@@ -233,21 +233,6 @@ class os_common {
     'port' => $base_syslog_hash['syslog_port']
   }
 
-### TCP connections keepalives and failover related parameters ###
-  # configure TCP keepalive for host OS.
-  # Send 3 probes each 8 seconds, if the connection was idle
-  # for a 30 seconds. Consider it dead, if there was no responces
-  # during the check time frame, i.e. 30+3*8=54 seconds overall.
-  # (note: overall check time frame should be lower then
-  # nova_report_interval).
-  class { 'openstack::keepalive' :
-    stage           => 'netconfig',
-    tcpka_time      => '30',
-    tcpka_probes    => '8',
-    tcpka_intvl     => '3',
-    tcp_retries2    => '5',
-  }
-
   # setting kernel reserved ports
   # defaults are 49000,35357,41055,58882
   class { 'openstack::reserved_ports':
@@ -300,6 +285,8 @@ class os_common {
     stage => 'first',
   }
 
+  class { 'osnailyfacter::ssh': }
+
   #case $role {
     #    /controller/:          { $hostgroup = 'controller' }
     #    /swift-proxy/: { $hostgroup = 'swift-proxy' }