openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

dfm uses different ports for the webui and the api

Browse Source
This commit is contained in:
alop
2013-02-14 12:28:15 -08:00
parent 331d1f5076
commit 93cb9cc565
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
attributes/default.rb
View File

@@ -74,7 +74,8 @@ default["cinder"]["netapp"]["protocol"] = "http"
default["cinder"]["netapp"]["dfm_hostname"] = nil default["cinder"]["netapp"]["dfm_hostname"] = nil
default["cinder"]["netapp"]["dfm_login"] = nil default["cinder"]["netapp"]["dfm_login"] = nil
default["cinder"]["netapp"]["dfm_password"] = 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" default["cinder"]["netapp"]["storage_service"] = "storage_service"
# logging attribute # logging attribute

2
templates/default/cinder.conf.erb
View File

@@ -574,7 +574,7 @@ volume_driver=<%= node["cinder"]["volume"]["volume_driver"] %>
######## defined in cinder.volume.netapp ######## ######## defined in cinder.volume.netapp ########
<% if node["cinder"]["netapp"]["enabled"] %> <% 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 #### (StrOpt) URL of the WSDL file for the DFM server
netapp_login=<%= node["cinder"]["netapp"]["dfm_login"] %> netapp_login=<%= node["cinder"]["netapp"]["dfm_login"] %>