diff --git a/attributes/default.rb b/attributes/default.rb index 534bd69..f9a98a6 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -74,7 +74,8 @@ default["cinder"]["netapp"]["protocol"] = "http" default["cinder"]["netapp"]["dfm_hostname"] = nil default["cinder"]["netapp"]["dfm_login"] = nil default["cinder"]["netapp"]["dfm_password"] = nil -default["cinder"]["netapp"]["dfm_port"] = "8080" +default["cinder"]["netapp"]["dfm_port"] = "8088" +default["cinder"]["netapp"]["dfm_web_port"] = "8080" default["cinder"]["netapp"]["storage_service"] = "storage_service" # logging attribute diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb index 847b318..c1ab684 100644 --- a/templates/default/cinder.conf.erb +++ b/templates/default/cinder.conf.erb @@ -574,7 +574,7 @@ volume_driver=<%= node["cinder"]["volume"]["volume_driver"] %> ######## defined in cinder.volume.netapp ######## <% if node["cinder"]["netapp"]["enabled"] %> -netapp_wsdl_url=<%= node["cinder"]["netapp"]["protocol"] %>://<%= node["cinder"]["netapp"]["dfm_hostname"] %>:<%= node["cinder"]["netapp"]["dfm_port"] %>/dfm.wsdl +netapp_wsdl_url=<%= node["cinder"]["netapp"]["protocol"] %>://<%= node["cinder"]["netapp"]["dfm_hostname"] %>:<%= node["cinder"]["netapp"]["dfm_web_port"] %>/dfm.wsdl #### (StrOpt) URL of the WSDL file for the DFM server netapp_login=<%= node["cinder"]["netapp"]["dfm_login"] %>