x/fuel-plugin-contrail
Code Issues Proposed changes

Provides support for more recent Contrail builds

Browse Source 
Change-Id: I64f08c0079e3de1a4868b5507770d9d101f3e7c6
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
This commit is contained in:
Illia Polliul
2015-10-07 11:01:47 +03:00
committed by Oleksandr Martsyniuk
parent 572e03a85a
commit 6d2c0590b3
8 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/manifests/site-common-pre.pp
View File

@@ -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,
}
}

10
deployment_scripts/puppet/manifests/site-contrail-post1.pp
View File

@@ -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:
{