openstack/fuel-library
Code Issues Proposed changes

Set proper service_type for Sahara for sahara template providers

Browse Source 
Change-Id: I918241635749f9a6e8d0b10808627ec963707000
Related-bug: #1356053
Closes-bug: #1535089
This commit is contained in:
Denis Egorenko 2016-01-18 12:48:36 +03:00
parent 1311681465
commit 309b3115bc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb
View File

@ -14,7 +14,7 @@ Puppet::Type.type(:sahara_cluster_template).provide(:ruby) do
:auth_method => 'password', :auth_method => 'password',
:auth_url => @resource[:auth_url], :auth_url => @resource[:auth_url],
:authtenant_name => @resource[:auth_tenant_name], :authtenant_name => @resource[:auth_tenant_name],
:service_type => 'data_processing', :service_type => 'data-processing',
:is_debug => @resource[:debug], :is_debug => @resource[:debug],
}) })
end end

2
deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb
View File

@ -14,7 +14,7 @@ Puppet::Type.type(:sahara_node_group_template).provide(:ruby) do
:auth_method => 'password', :auth_method => 'password',
:auth_url => @resource[:auth_url], :auth_url => @resource[:auth_url],
:authtenant_name => @resource[:auth_tenant_name], :authtenant_name => @resource[:auth_tenant_name],
:service_type => 'data_processing', :service_type => 'data-processing',
:is_debug => @resource[:debug], :is_debug => @resource[:debug],
}) })
end end

2
deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb
View File

@ -189,7 +189,7 @@ module OpenStack
OpenStack::Image::Connection.new(connection) OpenStack::Image::Connection.new(connection)
when 'network' when 'network'
OpenStack::Network::Connection.new(connection) OpenStack::Network::Connection.new(connection)
when 'data_processing' when 'data-processing'
OpenStack::Sahara::Connection.new(connection) OpenStack::Sahara::Connection.new(connection)
else else
raise Exception::InvalidArgument, "Invalid :service_type parameter: #{@service_type}" raise Exception::InvalidArgument, "Invalid :service_type parameter: #{@service_type}"