x
/
fuel-plugin-scaleio
Code Issues Proposed changes

Gateway configuration to move port 80 to 8081 

Change-Id: I92c5b09274e76e205056958207d07f967377c379
This commit is contained in:
Adrian Moreno 2015-11-24 16:43:21 +01:00
parent 1e1329e9c6
commit bdaaa07458
4 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/manifests/gateway_configuration.pp Normal file
View File

@ -0,0 +1,2 @@
$fuel_settings = parseyaml(file('/etc/astute.yaml'))
class {'scaleio_fuel::gateway_configuration': }

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

@ -10,6 +10,7 @@ inherits scaleio_fuel::params {
$services = ['openstack-cinder-volume', 'openstack-cinder-api', 'openstack-cinder-scheduler', 'openstack-nova-scheduler']
#2. Copy ScaleIO Files
file { 'scaleio.py':
path => '/usr/lib/python2.6/site-packages/cinder/volume/drivers/emc/scaleio.py',
@ -90,9 +91,4 @@ verify_server_certificate=False
service { $services:
ensure => running,
}
# ->
#
# class {'scaleio_fuel::ha':
# controllers => $controller_nodes,
# }
}

13
deployment_scripts/puppet/modules/scaleio_fuel/manifests/gateway.pp
View File

@ -1,13 +0,0 @@
class scaleio_fuel::gateway {
$gw_password = $scaleio_fuel::params::gw_password
$version = $scaleio_fuel::params::version
$mdm_ip = $scaleio_fuel::params::mdm_ip
class {'::scaleio':
gw_password => $gw_password,
version => $version,
mdm_ip => $mdm_ip,
components => ['gw'],
}
}

42
deployment_scripts/puppet/modules/scaleio_fuel/manifests/gateway_configuration.pp Normal file
View File

@ -0,0 +1,42 @@
class scaleio_fuel::gateway_configuration
inherits scaleio_fuel::params {
$role = $scaleio_fuel::params::role
if ($role == 'mdm') or ($role == 'tb') {
exec { 'Change ScaleIO gateway HTTP port to 8081 (server.xml)':
command => "sed -i 's|<Connector port=\"80\"|<Connector port=\"8081\"|g' /opt/emc/scaleio/gateway/conf/server.xml",
path => ['/bin'],
onlyif => '/usr/bin/test -f /opt/emc/scaleio/gateway/conf/server.xml',
} ->
exec { 'Change ScaleIO gateway HTTP port to 8081 (server_clientcert.xml)':
command => "sed -i 's|<Connector port=\"80\"|<Connector port=\"8081\"|g' /opt/emc/scaleio/gateway/conf/server_clientcert.xml",
path => ['/bin'],
onlyif => '/usr/bin/test -f /opt/emc/scaleio/gateway/conf/server_clientcert.xml',
} ->
exec { 'Check port file presence':
command => '/bin/true',
onlyif => '/usr/bin/test -f /opt/emc/scaleio/gateway/conf/port',
} ->
file { 'Update ScaleIO port file':
path => '/opt/emc/scaleio/gateway/conf/port',
source => 'puppet:///modules/scaleio_fuel/port',
mode => '0644',
owner => 'root',
group => 'root',
} ~>
service { 'scaleio-gateway':
ensure => running,
enable => true,
hasrestart => true,
}
} else {
notify {'Gateway not installed. Not doing anything.':}
}
}