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>
This commit is contained in:
parent
0591813082
commit
a8f78d202d
|
@ -11,10 +11,10 @@ $ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
|
||||||
|
|
||||||
|
|
||||||
if $operatingsystem == 'Ubuntu' {
|
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':
|
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}",
|
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",
|
path => '/usr/bin:/usr/sbin:/bin:/sbin',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elsif $operatingsystem == 'CentOS' {
|
} elsif $operatingsystem == 'CentOS' {
|
||||||
|
|
|
@ -3,8 +3,8 @@ $master_ip = hiera('master_ip')
|
||||||
|
|
||||||
if $operatingsystem == 'Ubuntu' {
|
if $operatingsystem == 'Ubuntu' {
|
||||||
exec { 'update flavors':
|
exec { 'update flavors':
|
||||||
command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/update_flavors.sh | bash -s",
|
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",
|
path => '/usr/bin:/usr/sbin:/bin:/sbin',
|
||||||
}
|
}
|
||||||
} elsif $operatingsystem == 'CentOS' {
|
} elsif $operatingsystem == 'CentOS' {
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue