x
/
fuel-plugin-scaleio
Code Issues Proposed changes

Number of required controller nodes reduced to 3. SIO gateway now installs on all controller nodes. 

Change-Id: Ia090d681fa2c1775174294600ef9ca288abcf938
This commit is contained in:
Adrian Moreno 2015-11-17 11:32:26 -08:00
parent fcafad5cfc
commit 017419f1dc
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment_scripts/puppet/modules/scaleio_fuel/manifests/init.pp
View File

@ -2,9 +2,8 @@ class scaleio_fuel
inherits scaleio_fuel::params {
case $role {
'mdm': { include scaleio_fuel::mdm }
'tb': { include scaleio_fuel::tb }
'gw': { include scaleio_fuel::gateway }
'sds': { include scaleio_fuel::sds }
'mdm': { include scaleio_fuel::mdm }
'tb': { include scaleio_fuel::tb }
'sds': { include scaleio_fuel::sds }
}
}

16
deployment_scripts/puppet/modules/scaleio_fuel/manifests/mdm.pp
View File

@ -1,6 +1,7 @@
class scaleio_fuel::mdm {
$admin_password = $scaleio_fuel::params::admin_password
$gw_password = $scaleio_fuel::params::gw_password
$version = $scaleio_fuel::params::version
$mdm_ip = $scaleio_fuel::params::mdm_ip
$tb_ip = $scaleio_fuel::params::tb_ip
@ -9,13 +10,14 @@ class scaleio_fuel::mdm {
$callhome_cfg = $scaleio_fuel::params::callhome_cfg
class {'::scaleio':
password => $admin_password,
version => $version,
mdm_ip => $mdm_ip,
tb_ip => $tb_ip,
cluster_name => $cluster_name,
password => $admin_password,
gw_password => $gw_password,
version => $version,
mdm_ip => $mdm_ip,
tb_ip => $tb_ip,
cluster_name => $cluster_name,
sio_sds_device => $sio_sds_device,
callhome_cfg => $callhome_cfg,
components => ['mdm','sds','sdc','callhome'],
callhome_cfg => $callhome_cfg,
components => ['mdm','gw','sds','sdc','callhome'],
}
}

8
deployment_scripts/puppet/modules/scaleio_fuel/manifests/params.pp
View File

@ -24,13 +24,12 @@ class scaleio_fuel::params
notice("controller_hashes: ${controller_hashes}")
notice("controller_ips: ${controller_ips}")
if size($controller_nodes) < 4 {
fail('ScaleIO plugin needs at least 4 controller nodes')
if size($controller_nodes) < 3 {
fail('ScaleIO plugin needs at least 3 controller nodes')
}
$mdm_ip = [$controller_ips[0], $controller_ips[1]]
$tb_ip = $controller_ips[2]
$gw_ip = $controller_ips[3]
$current_node = filter_nodes($nodes_hash,'uid', $::fuel_settings['uid'])
$node_ip = join(values(nodes_to_hash($current_node,'name','internal_address')))
@ -47,9 +46,6 @@ class scaleio_fuel::params
elsif $node_ip == $tb_ip {
$role = 'tb'
}
elsif $node_ip == $gw_ip {
$role = 'gw'
}
else {
$role = 'sds'
}

16
deployment_scripts/puppet/modules/scaleio_fuel/manifests/tb.pp
View File

@ -1,6 +1,7 @@
class scaleio_fuel::tb {
$admin_password = $scaleio_fuel::params::admin_password
$gw_password = $scaleio_fuel::params::gw_password
$version = $scaleio_fuel::params::version
$mdm_ip = $scaleio_fuel::params::mdm_ip
$tb_ip = $scaleio_fuel::params::tb_ip
@ -8,13 +9,14 @@ class scaleio_fuel::tb {
$callhome_cfg = $scaleio_fuel::params::callhome_cfg
class {'::scaleio':
password => $admin_password,
version => $version,
mdm_ip => $mdm_ip,
tb_ip => $tb_ip,
sio_sds_device => $sio_sds_device,
password => $admin_password,
gw_password => $gw_password,
version => $version,
mdm_ip => $mdm_ip,
tb_ip => $tb_ip,
sio_sds_device => $sio_sds_device,
sds_ssd_env_flag => true,
callhome_cfg => $callhome_cfg,
components => ['tb','sds','sdc'],
callhome_cfg => $callhome_cfg,
components => ['tb','gw','sds','sdc'],
}
}