From 536bcc090dfb88c0c40bd9410614e6753142b8f9 Mon Sep 17 00:00:00 2001 From: Mykola Yakovliev Date: Thu, 7 May 2015 13:58:06 -0500 Subject: [PATCH] Allow to install OVS from source in Ubuntu 14.04 According to possibility to deploy Openstack Juno on Ubuntu 14.04 will be great to have way to install OVS from source. In current situation it's impossible to mix Ubuntu 14.04 and use_source_version=True. Change-Id: I8e65defd01e71288a4c279aa411e295e74ef75c9 --- CHANGELOG.md | 3 +++ metadata.rb | 2 +- recipes/openvswitch.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cfb81e4..081795e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # CHANGELOG for cookbook-openstack-network This file is used to list changes made in each version of cookbook-openstack-network. +## 10.1.3 +* Add possibility to install OVS from source in Ubuntu 14.04 + ## 10.1.2 * Added support for providing custom interface driver in lbaas_agent.ini.erb diff --git a/metadata.rb b/metadata.rb index b32d4f34..3920dd82 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com' license 'Apache 2.0' description 'Installs and configures the OpenStack Network API Service and various agents and plugins' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '10.1.2' +version '10.1.3' recipe 'openstack-network::client', 'Install packages required for network client' recipe 'openstack-network::server', 'Installs packages required for a OpenStack Network server' recipe 'openstack-network::openvswitch', 'Installs packages required for OVS' diff --git a/recipes/openvswitch.rb b/recipes/openvswitch.rb index 17714203..214cd540 100644 --- a/recipes/openvswitch.rb +++ b/recipes/openvswitch.rb @@ -46,7 +46,7 @@ if platform_family?('debian') end if node['openstack']['network']['openvswitch']['use_source_version'] - if node['lsb'] && node['lsb']['codename'] == 'precise' + if node['lsb'] && ['precise', 'trusty'].include?(node['lsb']['codename']) include_recipe 'openstack-network::build_openvswitch_source' end else