Browse Source

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>
tags/10.0-eol
Romanos Skiadas 2 years ago
parent
commit
a8f78d202d

+ 3
- 3
deployment_scripts/puppet/manifests/ovs-install.pp View File

@@ -11,10 +11,10 @@ $ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
11 11
 
12 12
 
13 13
 if $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 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}",
17
-          path   => "/usr/bin:/usr/sbin:/bin:/sbin",
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',
18 18
       }
19 19
     }
20 20
 } elsif $operatingsystem == 'CentOS' {

+ 2
- 2
deployment_scripts/puppet/manifests/ovs-update-flavors.pp View File

@@ -3,8 +3,8 @@ $master_ip      = hiera('master_ip')
3 3
 
4 4
 if $operatingsystem == 'Ubuntu' {
5 5
     exec { 'update flavors':
6
-        command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/update_flavors.sh | bash -s",
7
-        path   => "/usr/bin:/usr/sbin:/bin:/sbin",
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',
8 8
     }
9 9
 } elsif $operatingsystem == 'CentOS' {
10 10
 }

Loading…
Cancel
Save