summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomanos Skiadas <rski@intracom-telecom.com>2016-11-09 11:10:58 +0200
committerRomanos Skiadas <rski@intracom-telecom.com>2016-11-09 14:08:12 +0200
commita8f78d202d502f0bc51d12d88b39905a8e8278e8 (patch)
tree02240f44858e60d4d839339d193f964b60897ff9
parent0591813082722a61835b3aba38244e6a9d52ac17 (diff)
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>
Notes
Notes (review): Code-Review+2: Michal Skalski <mskalski@mirantis.com> Workflow+1: Michal Skalski <mskalski@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 09 Nov 2016 12:23:35 +0000 Reviewed-on: https://review.openstack.org/395475 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/ovs-install.pp6
-rw-r--r--deployment_scripts/puppet/manifests/ovs-update-flavors.pp4
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'], []), ',')
11 11
12 12
13if $operatingsystem == 'Ubuntu' { 13if $operatingsystem == 'Ubuntu' {
14 if (!roles_include(['primary-controller', 'controller'])) or ($install_on_controller == 'true') { 14 if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
15 exec { 'install ovs_nsh_dpdk': 15 exec { 'install ovs_nsh_dpdk':
16 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}", 16 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}",
17 path => "/usr/bin:/usr/sbin:/bin:/sbin", 17 path => '/usr/bin:/usr/sbin:/bin:/sbin',
18 } 18 }
19 } 19 }
20} elsif $operatingsystem == 'CentOS' { 20} 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')
3 3
4if $operatingsystem == 'Ubuntu' { 4if $operatingsystem == 'Ubuntu' {
5 exec { 'update flavors': 5 exec { 'update flavors':
6 command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/update_flavors.sh | bash -s", 6 command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-1.0/deployment_scripts/update_flavors.sh | bash -s",
7 path => "/usr/bin:/usr/sbin:/bin:/sbin", 7 path => '/usr/bin:/usr/sbin:/bin:/sbin',
8 } 8 }
9} elsif $operatingsystem == 'CentOS' { 9} elsif $operatingsystem == 'CentOS' {
10} 10}