Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change EMC VNX backend parameters, because it's changed in Juno #240

Closed
wants to merge 1 commit into from
Closed

Change EMC VNX backend parameters, because it's changed in Juno #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cinder/manifests/backend/emc_vnx.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
#
# == Parameters
#
# [*iscsi_initiators*]
#
# (required) IP addresses of the iSCSI initiator ports on all OpenStack nodes which want to connec to VNX via iSCSI
# Example: {"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}
# Default to: none
#
# [*volume_backend_name*]
# (optional) Allows for the volume_backend_name to be separate of $name.
# Defaults to: $name
Expand Down Expand Up @@ -36,7 +42,7 @@
# Defaults to: 'present'
#
define cinder::backend::emc_vnx (
$iscsi_ip_address,
$iscsi_initiators,
$san_ip,
$san_password,
$storage_vnx_pool_name,
Expand All @@ -51,7 +57,7 @@

cinder_config {
"${name}/default_timeout": value => $default_timeout;
"${name}/iscsi_ip_address": value => $iscsi_ip_address;
"${name}/iscsi_initiators": value => $iscsi_initiators;
"${name}/max_luns_per_storage_group": value => $max_luns_per_storage_group;
"${name}/naviseccli_path": value => '/opt/Navisphere/bin/naviseccli';
"${name}/san_ip": value => $san_ip;
Expand Down
10 changes: 8 additions & 2 deletions cinder/manifests/volume/emc_vnx.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
#
# === Parameters
#
# [*iscsi_initiators*]
#
# (required) IP addresses of the iSCSI initiator ports on all OpenStack nodes which want to connec to VNX via iSCSI
# Example: {"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}
# Default to: none
#
# [*san_ip*]
# (required) IP address of SAN controller.
#
Expand All @@ -27,7 +33,7 @@
# Defaults to: '256'
#
class cinder::volume::emc_vnx(
$iscsi_ip_address,
$iscsi_initiators,
$san_ip,
$san_password,
$storage_vnx_pool_name,
Expand All @@ -39,7 +45,7 @@

cinder::backend::emc_vnx { 'DEFAULT':
default_timeout => $default_timeout,
iscsi_ip_address => $iscsi_ip_address,
iscsi_initiators => $iscsi_initiators,
max_luns_per_storage_group => $max_luns_per_storage_group,
package_ensure => $package_ensure,
san_ip => $san_ip,
Expand Down
4 changes: 2 additions & 2 deletions cinder/spec/classes/cinder_volume_emc_vnx_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:san_ip => '127.0.0.2',
:san_login => 'emc',
:san_password => 'password',
:iscsi_ip_address => '127.0.0.3',
:iscsi_initiators => '{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}',
:storage_vnx_pool_name => 'emc-storage-pool'
}
end
Expand All @@ -25,7 +25,7 @@
should contain_cinder_config('DEFAULT/san_ip').with_value('127.0.0.2')
should contain_cinder_config('DEFAULT/san_login').with_value('emc')
should contain_cinder_config('DEFAULT/san_password').with_value('password')
should contain_cinder_config('DEFAULT/iscsi_ip_address').with_value('127.0.0.3')
should contain_cinder_config('DEFAULT/iscsi_initiators').with_value('{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}')
should contain_cinder_config('DEFAULT/storage_vnx_pool_name').with_value('emc-storage-pool')
end
end
Expand Down
4 changes: 2 additions & 2 deletions cinder/spec/defines/cinder_backend_emc_vnx_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:san_ip => '127.0.0.2',
:san_login => 'emc',
:san_password => 'password',
:iscsi_ip_address => '127.0.0.3',
:iscsi_initiators => '{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}',
:storage_vnx_pool_name => 'emc-storage-pool'
}
end
Expand All @@ -27,7 +27,7 @@
should contain_cinder_config('emc/san_ip').with_value('127.0.0.2')
should contain_cinder_config('emc/san_login').with_value('emc')
should contain_cinder_config('emc/san_password').with_value('password')
should contain_cinder_config('emc/iscsi_ip_address').with_value('127.0.0.3')
should contain_cinder_config('emc/iscsi_initiators').with_value('{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}')
should contain_cinder_config('emc/storage_vnx_pool_name').with_value('emc-storage-pool')
end
end
Expand Down