Contrail syslog script updated

- analytics_api_ip argument added to contrail-logs command
- cron job now is executed on primary config node only

Change-Id: I0aa8f32dde2acfd86ab4bd4d1b436c2356f69591

deployment_scripts/puppet/modules/contrail/manifests/analytics.pp

@@ -97,23 +97,26 @@ class contrail::analytics {
   }
 
   # Cron job for transfer contrail-logs to Fuel master
-  file { 'contrailsyslog.sh':
-    ensure  => 'present',
-    path    => '/usr/local/sbin/contrailsyslog.sh',
-    mode    => '0700',
-    owner   => 'root',
-    group   => 'root',
-    content => template('contrail/contrailsyslog.sh.erb'),
-  }
+  # Runs on primary analytics node
+  if $contrail::node_role == 'primary-contrail-config' {
+    file { 'contrailsyslog.sh':
+      ensure  => 'present',
+      path    => '/usr/local/sbin/contrailsyslog.sh',
+      mode    => '0700',
+      owner   => 'root',
+      group   => 'root',
+      content => template('contrail/contrailsyslog.sh.erb'),
+    }
 
-  cron { 'contrail-syslog':
-    command => '/usr/local/sbin/contrailsyslog.sh',
-    user    => 'root',
-    minute  => '*/1',
-    require => [
-      Service['supervisor-analytics'],
-      File['contrailsyslog.sh'],
-    ],
+    cron { 'contrail-syslog':
+      command => '/usr/local/sbin/contrailsyslog.sh',
+      user    => 'root',
+      minute  => '*/1',
+      require => [
+        Service['supervisor-analytics'],
+        File['contrailsyslog.sh'],
+      ],
+    }
   }
 
 }

deployment_scripts/puppet/modules/contrail/templates/contrailsyslog.sh.erb

@@ -15,6 +15,7 @@
 #    under the License.
 
 /usr/bin/contrail-logs \
+    --analytics-api-ip <%= scope.lookupvar('contrail::contrail_private_vip') %> \
     --last 1m \
     --level SYS_INFO \
     --send-syslog \