x
/
fuel-plugin-scaleio
Code Issues Proposed changes

Use storage network instead of management network 

Change-Id: I60efb5c1d407dd5b3cd8aee67147bfd92c9af145
This commit is contained in:
Adrian Moreno 2015-12-15 16:52:26 +01:00
parent 4513991cca
commit 82a567a07d
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -13,3 +13,6 @@
# Sphinx
_build/
# PDF
*.pdf

2
deployment_scripts/puppet/modules/scaleio_fuel/lib/puppet/parser/functions/get_sds_devices.rb
View File

@ -9,7 +9,7 @@ module Puppet::Parser::Functions
nodes.each do |node|
result[node["fqdn"]] = {
"ip" => node["internal_address"],
"ip" => node["storage_address"],
"protection_domain" => protection_domain,
"devices" => {
device => {

12
deployment_scripts/puppet/modules/scaleio_fuel/manifests/enable_ha.pp
View File

@ -6,21 +6,19 @@ inherits scaleio_fuel::params {
$gw3_ip = $scaleio_fuel::params::tb_ip
$nodes_hash = $::fuel_settings['nodes']
$gw1 = filter_nodes($nodes_hash, 'internal_address', $gw1_ip)
$gw2 = filter_nodes($nodes_hash, 'internal_address', $gw2_ip)
$gw3 = filter_nodes($nodes_hash, 'internal_address', $gw3_ip)
$gw1 = filter_nodes($nodes_hash, 'storage_address', $gw1_ip)
$gw2 = filter_nodes($nodes_hash, 'storage_address', $gw2_ip)
$gw3 = filter_nodes($nodes_hash, 'storage_address', $gw3_ip)
$gw_nodes = concat(concat($gw1, $gw2), $gw3)
notify { "gw_nodes: ${gw_nodes}": }
notify { "server_names: ${server_names}": }
notify { "ipaddresses: ${ipaddresses}": }
notify { "Gateway nodes: ${gw_nodes}": }
Haproxy::Service { use_include => true }
Haproxy::Balancermember { use_include => true }
Openstack::Ha::Haproxy_service {
server_names => filter_hash($gw_nodes, 'name'),
ipaddresses => filter_hash($gw_nodes, 'internal_address'),
ipaddresses => filter_hash($gw_nodes, 'storage_address'),
public_virtual_ip => $::fuel_settings['public_vip'],
internal_virtual_ip => $::fuel_settings['management_vip'],
}

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

@ -1,9 +1,11 @@
class scaleio_fuel
inherits scaleio_fuel::params {
$role = $scaleio_fuel::params::role
case $role {
'mdm': { include scaleio_fuel::mdm }
'tb': { include scaleio_fuel::tb }
'sds': { include scaleio_fuel::sds }
default: { include scaleio_fuel::sds }
}
}

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

@ -13,8 +13,8 @@ class scaleio_fuel::params
$volume_type = 'sio_thin'
$nodes_hash = $::fuel_settings['nodes']
$controller_nodes = concat(filter_nodes($nodes_hash,'role','primary-controller'), filter_nodes($nodes_hash,'role','controller'))
$controller_hashes = nodes_to_hash($controller_nodes,'name','internal_address')
$controller_nodes = concat(filter_nodes($nodes_hash, 'role', 'primary-controller'), filter_nodes($nodes_hash, 'role', 'controller'))
$controller_hashes = nodes_to_hash($controller_nodes, 'name', 'storage_address')
$controller_ips = ipsort(values($controller_hashes))
notify {"Controller Nodes: ${controller_nodes}": }
@ -29,7 +29,7 @@ class scaleio_fuel::params
$current_node = filter_nodes($nodes_hash,'uid', $::fuel_settings['uid'])
$node_ip = join(values(
nodes_to_hash($current_node,'name','internal_address')))
nodes_to_hash($current_node,'name','storage_address')))
notify {"Current Node: ${current_node}": }

2
metadata.yaml
View File

@ -3,7 +3,7 @@ name: scaleio
# Human-readable name for your plugin
title: ScaleIO plugin
# Plugin version
version: '1.0.0'
version: '1.0.1'
# Description
description: This plugin deploys and enables EMC ScaleIO as the block storage backend
# Required fuel version