Merge "Modify default lldp system description"

puppet-manifests/src/modules/platform/manifests/lldp.pp

@@ -1,6 +1,7 @@
 class platform::lldp::params(
   $tx_interval = 30,
   $tx_hold = 4,
+  $options = []
 ) {}
 
 
@@ -19,6 +20,13 @@ class platform::lldp
       notify => Service['lldpd'],
   }
 
+  file { "/etc/default/lldpd":
+      ensure => 'present',
+      replace => true,
+      content => template('platform/lldpd.default.erb'),
+      notify => Service['lldpd'],
+  }
+
   service { 'lldpd':
     ensure     => 'running',
     enable     => true,

puppet-manifests/src/modules/platform/templates/lldp.conf.erb

@@ -1,5 +1,4 @@
 configure system hostname '<%= @hostname %>:<%= @system %>'
-configure system description 'Titanium Cloud version <%= @version %>'
 configure lldp tx-interval <%= @tx_interval %>
 configure lldp tx-hold <%= @tx_hold %>
 configure system interface pattern *,!br*,!ovs*,!tap*

puppet-manifests/src/modules/platform/templates/lldpd.default.erb

@@ -0,0 +1,6 @@
+DAEMON_ARGS=<%- @options.each do |option| -%>
+ <%= option['option'] -%>
+<%- if option.has_key? 'arguments' -%>
+ <%= option['arguments'] -%>
+<%- end -%>
+<%- end -%>

sysinv/sysinv/sysinv/sysinv/puppet/ovs.py

@@ -395,6 +395,13 @@ class OVSPuppet(base.BasePuppet):
         driver_list = self.context['_lldp_drivers']
         driver_list.append('ovs')
 
+        lldpd_options = []
+
+        # Disable broadcasting the kernel version
+        lldpd_kernel_option = {"option": "-k"}
+        lldpd_options.append(lldpd_kernel_option)
+
         return {
-            'sysinv::agent::lldp_drivers': driver_list
+            'sysinv::agent::lldp_drivers': driver_list,
+            'platform::lldp::params::options': lldpd_options
         }