From a8f78d202d502f0bc51d12d88b39905a8e8278e8 Mon Sep 17 00:00:00 2001
From: Romanos Skiadas <rski@intracom-telecom.com>
Date: Wed, 9 Nov 2016 11:10:58 +0200
Subject: [PATCH] Fix for installing ovs on controller, update urls

$install_on_controller was being compared to a quoted true, and since
true != 'true', the expression always evaluated to false, regardless of
whether the feature was enabled.
Also update the urls from where the scripts are pulled to point to 1.0
version of the plugin.

Change-Id: Ifa961240d1ccd53e56b93d5afae7da0df26c1e34
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
---
 deployment_scripts/puppet/manifests/ovs-install.pp        | 6 +++---
 deployment_scripts/puppet/manifests/ovs-update-flavors.pp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/ovs-install.pp b/deployment_scripts/puppet/manifests/ovs-install.pp
index 30bb50c..f810de8 100644
--- a/deployment_scripts/puppet/manifests/ovs-install.pp
+++ b/deployment_scripts/puppet/manifests/ovs-install.pp
@@ -11,10 +11,10 @@ $ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
 
 
 if $operatingsystem == 'Ubuntu' {
-  if (!roles_include(['primary-controller', 'controller'])) or ($install_on_controller == 'true') {
+  if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
       exec { 'install ovs_nsh_dpdk':
-          command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk} ${ovs_socket_mem}",
-          path   => "/usr/bin:/usr/sbin:/bin:/sbin",
+          command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-1.0/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk} ${ovs_socket_mem}",
+          path    => '/usr/bin:/usr/sbin:/bin:/sbin',
       }
     }
 } elsif $operatingsystem == 'CentOS' {
diff --git a/deployment_scripts/puppet/manifests/ovs-update-flavors.pp b/deployment_scripts/puppet/manifests/ovs-update-flavors.pp
index 79eb256..cc8e0d7 100644
--- a/deployment_scripts/puppet/manifests/ovs-update-flavors.pp
+++ b/deployment_scripts/puppet/manifests/ovs-update-flavors.pp
@@ -3,8 +3,8 @@ $master_ip      = hiera('master_ip')
 
 if $operatingsystem == 'Ubuntu' {
     exec { 'update flavors':
-        command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/update_flavors.sh | bash -s",
-        path   => "/usr/bin:/usr/sbin:/bin:/sbin",
+        command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-1.0/deployment_scripts/update_flavors.sh | bash -s",
+        path    => '/usr/bin:/usr/sbin:/bin:/sbin',
     }
 } elsif $operatingsystem == 'CentOS' {
 }