From 309b3115bce2c3c478e2f636a3afafa675505949 Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Mon, 18 Jan 2016 12:48:36 +0300 Subject: [PATCH] Set proper service_type for Sahara for sahara template providers Change-Id: I918241635749f9a6e8d0b10808627ec963707000 Related-bug: #1356053 Closes-bug: #1535089 --- .../lib/puppet/provider/sahara_cluster_template/ruby.rb | 2 +- .../lib/puppet/provider/sahara_node_group_template/ruby.rb | 2 +- .../sahara_templates/lib/puppet/provider/sahara_openstack.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb index ff0f9abbc9..c8e497bf26 100644 --- a/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb +++ b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_cluster_template/ruby.rb @@ -14,7 +14,7 @@ Puppet::Type.type(:sahara_cluster_template).provide(:ruby) do :auth_method => 'password', :auth_url => @resource[:auth_url], :authtenant_name => @resource[:auth_tenant_name], - :service_type => 'data_processing', + :service_type => 'data-processing', :is_debug => @resource[:debug], }) end diff --git a/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb index ae5f8ec2d2..5804a59f75 100644 --- a/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb +++ b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_node_group_template/ruby.rb @@ -14,7 +14,7 @@ Puppet::Type.type(:sahara_node_group_template).provide(:ruby) do :auth_method => 'password', :auth_url => @resource[:auth_url], :authtenant_name => @resource[:auth_tenant_name], - :service_type => 'data_processing', + :service_type => 'data-processing', :is_debug => @resource[:debug], }) end diff --git a/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb index a61b0212c6..31035d4877 100644 --- a/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb +++ b/deployment/puppet/sahara_templates/lib/puppet/provider/sahara_openstack.rb @@ -189,7 +189,7 @@ module OpenStack OpenStack::Image::Connection.new(connection) when 'network' OpenStack::Network::Connection.new(connection) - when 'data_processing' + when 'data-processing' OpenStack::Sahara::Connection.new(connection) else raise Exception::InvalidArgument, "Invalid :service_type parameter: #{@service_type}"