Merge pull request #554 from rajinir/master

BZ #1247684 Puppet Errors with cinder Dell SC multibackend
redhat-openstack · Jul 30, 2015 · deed18e · deed18e
2 parents cdc4ca9 + ab35f1b
commit deed18e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/puppet/modules/quickstack/manifests/cinder_volume.pp b/puppet/modules/quickstack/manifests/cinder_volume.pp
@@ -253,7 +253,7 @@
  $last = $count -1
  $dell_sc_backends = produce_array_with_prefix('dell_sc',1,$count) #Initialize with section headers
 
- quickstack::dellsc::volume { $last:
+ quickstack::dell::sc_iscsi::volume { $last:
  index => $last,
  backend_section_name_array => $dell_sc_backends,
  backend_dell_sc_name_array => $backend_dell_sc_name,

diff --git a/puppet/modules/quickstack/manifests/cinder_volume_types.pp b/puppet/modules/quickstack/manifests/cinder_volume_types.pp
@@ -36,7 +36,7 @@
  }
 
  if str2bool_i($backend_dell_sc) {
- $dell_sc_last_index = size($backend_dell_sc) - 1
+ $dell_sc_last_index = size($backend_dell_sc_name) - 1
 
  Exec['wait-for-cinder-api-being-reachable'] ->
  quickstack::cinder::multi_instance_type { "dell-sc-${dell_sc_last_index}":

diff --git a/...les/quickstack/manifests/dellsc/volume.pp → ...ckstack/manifests/dell/sc_iscsi/volume.pp b/...les/quickstack/manifests/dellsc/volume.pp → ...ckstack/manifests/dell/sc_iscsi/volume.pp
@@ -1,4 +1,4 @@
-define quickstack::dell_sc_iscsi::volume (
+define quickstack::dell::sc_iscsi::volume (
  $index,
  $backend_section_name_array,
  $backend_dell_sc_name_array,
@@ -37,11 +37,12 @@
  dell_sc_ssn => $dell_sc_ssn,
  dell_sc_api_port => $dell_sc_api_port,
  dell_sc_server_folder => $dell_sc_server_folder,
+ dell_sc_volume_folder => $dell_sc_volume_folder,
  }
 
  #recurse
  $next = $index -1
- quickstack::dellsc::dellsc_iscsi {$next:
+ quickstack::dell::sc_iscsi::volume {$next:
  index => $next,
  backend_section_name_array => $backend_section_name_array,
  backend_dell_sc_name_array => $backend_dell_sc_name_array,

diff --git a/puppet/modules/quickstack/manifests/params.pp b/puppet/modules/quickstack/manifests/params.pp
@@ -36,8 +36,6 @@
  $cinder_backend_iscsi_name = 'iscsi',
  $cinder_backend_nfs = false,
  $cinder_backend_nfs_name = 'nfs',
- $cinder_backend_dell_sc = false,
- $cinder_backend_dell_sc_name = ['dell_sc'],
  $cinder_backend_eqlx = false,
  $cinder_backend_eqlx_name = ['eqlx'],
  $cinder_backend_netapp = false,
@@ -53,16 +51,6 @@
  # Cinder nfs
  $cinder_nfs_shares = [ '192.168.0.4:/cinder' ],
  $cinder_nfs_mount_options = '',
- # Cinder Dell Storage Center ISCSI
- $cinder_dell_sc_san_ip = ['172.23.8.101'],
- $cinder_dell_sc_san_login = ['Admin'],
- $cinder_dell_sc_san_password = ['CHANGEME'],
- $cinder_dell_sc_iscsi_ip_address = ['192.168.0.20'],
- $cinder_dell_sc_iscsi_port = [3260],
- $cinder_dell_sc_ssn = ['64702'],
- $cinder_dell_sc_api_port = [3033],
- $cinder_dell_sc_server_folder = ['server'],
- $cinder_dell_sc_volume_folder = ['volume'],
  # Cinder Dell EqualLogic
  $cinder_san_ip = ['192.168.124.11'],
  $cinder_san_login = ['grpadmin'],