Provides support for more recent Contrail builds

Change-Id: I64f08c0079e3de1a4868b5507770d9d101f3e7c6
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>

deployment_scripts/puppet/manifests/site-common-pre.pp

@@ -39,7 +39,7 @@ case $operatingsystem
         package {'yum-plugin-priorities': ensure => present }
       }
     Ubuntu: {
-      file { '/etc/apt/preferences.d/contrail-2.0.0.pref':
+      file { '/etc/apt/preferences.d/contrail-2.1.0.pref':
         ensure => absent,
       }
     }

deployment_scripts/puppet/manifests/site-contrail-post1.pp

@@ -28,16 +28,6 @@ if $contrail::node_name =~ /^contrail.\d+$/ {
           $pkgs = ['python-crypto','python-netaddr','python-paramiko',
                   'ifenslave-2.6','patch','openjdk-7-jre-headless',
                   'python-contrail','contrail-setup','contrail-utils','contrail-nodemgr','supervisor']
-          if $contrail::distribution == 'juniper' {
-            package { 'tzdata':
-              ensure => '2015c-0ubuntu0.14.04',
-              before => Class['contrail::package'],
-            }
-            package { 'tzdata-java':
-              ensure => '2015c-0ubuntu0.14.04',
-              before => Class['contrail::package'],
-            }
-          }
         }
       CentOS:
         {

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

@@ -62,6 +62,10 @@ class contrail::analytics {
     content => template('contrail/contrail-topology.conf.erb'),
   }
 
+  file { '/etc/contrail/supervisord_analytics_files/contrail-alarm-gen.ini':
+    ensure => absent,
+  }
+
 # Services
   service { 'redis-server':
     ensure    => running,
@@ -70,10 +74,18 @@ class contrail::analytics {
     subscribe => File['/etc/redis/redis.conf'],
   }
 
+  service { 'contrail-alarm-gen':
+    ensure    => stopped,
+    enable    => false,
+    require   => [Package['contrail-openstack-analytics'],File['/etc/contrail/supervisord_analytics_files/contrail-alarm-gen.ini']],
+  }
+
   service { 'supervisor-analytics':
     ensure      => running,
     enable      => true,
-    require     => [Package['contrail-openstack-analytics'],Service['redis-server']],
+    require     => [Package['contrail-openstack-analytics'],
+                    Service['redis-server'],
+                    Service['contrail-alarm-gen']],
     subscribe   => [File['/etc/contrail/contrail-analytics-api.conf'],
                     File['/etc/contrail/contrail-collector.conf'],
                     File['/etc/contrail/contrail-query-engine.conf'],

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

@@ -81,6 +81,10 @@ class contrail::cfgm {
     content => template('contrail/contrail-api.conf.erb'),
   }
 
+  file { '/etc/contrail/supervisord_config_files/contrail-api.ini':
+    content => template('contrail/contrail-api.ini.erb'),
+  }
+
   file { '/etc/contrail/contrail-discovery.conf':
     content => template('contrail/contrail-discovery.conf.erb'),
   }
@@ -128,6 +132,7 @@ class contrail::cfgm {
     enable    => true,
     require   => Package['contrail-openstack-config'],
     subscribe => [File['/etc/contrail/contrail-api.conf'],
+                  File['/etc/contrail/supervisord_config_files/contrail-api.ini'],
                   File['/etc/contrail/contrail-discovery.conf'],
                   File['/etc/contrail/contrail-keystone-auth.conf'],
                   File['/etc/contrail/contrail-schema.conf'],

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

@@ -26,6 +26,7 @@ class contrail::config ( $node_role ) {
         'DEFAULT/neutron_url_timeout': value=> '300';
         'DEFAULT/firewall_driver': value=> 'nova.virt.firewall.NoopFirewallDriver';
         'DEFAULT/security_group_api': value=> 'neutron';
+        'DEFAULT/heal_instance_info_cache_interval': value=> '0';
       }
 
       $ipv4_file = $operatingsystem ? {

deployment_scripts/puppet/modules/contrail/templates/contrail-api.ini.erb

@@ -0,0 +1,13 @@
+[program:contrail-api]
+command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --worker_id %(process_num)s --listen_port 9100
+numprocs=1
+process_name=%(process_num)s
+redirect_stderr=true
+stdout_logfile= /var/log/contrail/contrail-api-%(process_num)s-stdout.log
+stderr_logfile=/dev/null
+priority=440
+autostart=true
+killasgroup=true
+stopsignal=KILL
+exitcodes=0 ; 'expected' exit codes for process (default 0,2)
+user=contrail

install.sh

@@ -27,9 +27,10 @@
 
 set -ex
 
-PLUGIN_PATH="/var/www/nailgun/plugins/contrail-2.0"
-UBUNTU_PKG=`find $PLUGIN_PATH -maxdepth 1 -name 'contrail-install-packages*.deb'`
-CENTOS_PKG=`find $PLUGIN_PATH -maxdepth 1 -name 'contrail-install-packages*.rpm'`
+PLUGIN_PATH="/var/www/nailgun/plugins/contrail-2.1"
+#Now uses the latest package file
+UBUNTU_PKG=`find $PLUGIN_PATH -maxdepth 1 -name 'contrail-install-packages*.deb' -exec stat -c "%y %n" {} + | sort -r | head -n 1 | cut -d' ' -f 4`
+CENTOS_PKG=`find $PLUGIN_PATH -maxdepth 1 -name 'contrail-install-packages*.rpm' -exec stat -c "%y %n" {} + | sort -r | head -n 1 | cut -d' ' -f 4`
 
 yum -y install dpkg-devel createrepo
 

metadata.yaml

@@ -3,7 +3,7 @@ name: contrail
 # Human-readable name for your plugin
 title: Fuel Contrail plugin
 # Plugin version
-version: 2.0.0
+version: 2.1.0
 # Description
 description: Contrail plugin for Fuel provides the functionality to add Juniper Contrail SDN for Mirantis OpenStack as network backend using Fuel Web UI in a user-friendly manner
 # Required fuel version