Merge "Minor version bump." into stable/2.1

This commit is contained in:
Jenkins 2016-01-12 14:12:17 +00:00 committed by Gerrit Code Review
commit 8646da738d
4 changed files with 4 additions and 4 deletions

View File

@ -17,4 +17,4 @@ How to build plugin:
fpb --build .
- Check if file contrail-2.1-2.1.0-1.noarch.rpm was created.
- Check if file contrail-2.1-2.1.1-1.noarch.rpm was created.

View File

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

View File

@ -16,7 +16,7 @@
/usr/bin/contrail-logs \
--last 1m \
--level SYS_INFO \
--level SYS_ERR \
--send-syslog \
--syslog-server <%= scope.lookupvar('contrail::master_ip') %> \
--syslog-port 514

View File

@ -3,7 +3,7 @@ name: contrail
# Human-readable name for your plugin
title: Fuel Contrail plugin
# Plugin version
version: 2.1.0
version: 2.1.1
# 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