lib/process/cloud/providers/openstack/openstack.rb in lorj_cloud-0.1.11 vs lib/process/cloud/providers/openstack/openstack.rb in lorj_cloud-0.1.12

- old
+ new

@@ -54,11 +54,11 @@ obj_needs :data, 'credentials#account_id', :mapping => :openstack_username obj_needs :data, 'credentials#account_key', :mapping => :openstack_api_key, :decrypt => true obj_needs :data, 'credentials#auth_uri', :mapping => :openstack_auth_url obj_needs :data, 'credentials#tenant', :mapping => :openstack_tenant - obj_needs :data, 'services#compute', :mapping => :openstack_region + obj_needs :data, 'services#compute', :mapping => :openstack_region obj_needs_optional # Data required if uri contains v3 obj_needs :data, :user_domain, :mapping => :openstack_user_domain obj_needs :data, :prj_domain, :mapping => :openstack_project_domain @@ -66,11 +66,11 @@ obj_needs :data, 'credentials#account_id', :mapping => :openstack_username obj_needs :data, 'credentials#account_key', :mapping => :openstack_api_key, :decrypt => true obj_needs :data, 'credentials#auth_uri', :mapping => :openstack_auth_url obj_needs :data, 'credentials#tenant', :mapping => :openstack_tenant - obj_needs :data, 'services#network', :mapping => :openstack_region + obj_needs :data, 'services#network', :mapping => :openstack_region obj_needs_optional # Data required if uri contains v3 obj_needs :data, :user_domain, :mapping => :openstack_user_domain obj_needs :data, :prj_domain, :mapping => :openstack_project_domain @@ -84,11 +84,11 @@ def_hdata :network_name, :mapping => :name def_attr_mapping :external, :router_external define_obj :keypairs - undefine_attribute :id # Do not return any predefined ID + undefine_attribute :id # Do not return any predefined ID define_obj :server_log # Excon::Response object type def_attr_mapping :output, 'output' @@ -96,11 +96,11 @@ define_obj :security_groups # Added tenant data to add in queries. obj_needs :CloudObject, :tenants define_obj :rule - obj_needs :data, :dir, :mapping => :direction + obj_needs :data, :dir, :mapping => :direction attr_value_mapping :IN, 'ingress' attr_value_mapping :OUT, 'egress' obj_needs :data, :proto, :mapping => :protocol obj_needs :data, :port_min, :mapping => :port_range_min @@ -458,9 +458,10 @@ body = Fog::OpenStack.retrieve_tokens_v2(hParams[:hdata], hParams[:excon_opts]) end build_result(version, body) end + # Function to provide a wel formatted standard data, usable by openstack # provider # # * *args*: # - version: :v1, :v2 or :v3. Based on openstack authentication version