foreman_ovirt 0.1.0 → 0.2.0

data/README.rdoc

@@ -4,17 +4,14 @@ Test engine for ovirt-foreman integration
 
 = Install
 
-Add to gemfile
-
-gem 'foreman_ovirt', :git => "https://github.com/isratrade/foreman_ovirt"
-
-Currently, you must use the branch "test_engine" under "https://github.com/isratrade/foreman" since this version removes the catchall in routes.rb and v1.rb and adds a forward slash to :controller => '/unattended' in hosts_helper.rb.
+1. gem install foreman_ovirt
+2. Add bundler.d folder in Foreman a file called foreman_ovirt, containing the line:
+gem 'foreman_ovirt'
 
 = Usage
 
-Go to view host and add /ovirt to the path
-
-Example:  localhost/hosts/foreman-test.sat.lab.tlv.redhat.com/ovirt
+See the README-foreman-plugin in the oVirt plugin repository (http://gerrit.ovirt.org/p/samples-uiplugins.git) for guidelines on what to do in the oVirt engine server.
+Also see ovedou.blogspot.com for more information, as I have a blog post on that.
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/app/models/foreman_ovirt/user_extensions.rb

@@ -7,17 +7,18 @@ module ForemanOvirt
 
 	module InstanceMethods
     	def add_role_to_user
+        logger.debug "add_role_to_user started"
         user_auth_source = AuthSource.find(auth_source)
-    		if (user_auth_source && user_auth_source.type == "AuthSourceOvirt")
-          #if auth_source is ovirt
+        logger.debug "auth source is: " + user_auth_source.type
+	if (user_auth_source && user_auth_source.type == "ForemanOvirt::AuthSourceOvirt")
+          # Checking auth_source is oVirt
           ovirt_role_id = Role.find_by_name("Ovirt").id
           if (!user_roles.find_by_role_id(ovirt_role_id))
-            puts ovirt_role_id
+            logger.debug "adding oVirt role to user " + name
             user_roles.create(:role_id => ovirt_role_id)
-            puts "add_role_to_user"
           end
         end
-    	end
+      end
     end
   end
 end

data/config/initializers/ovirt_setup.rb

@@ -1,3 +1,6 @@
+# Requiring the foreman_ovirt bundler group
+Bundler.require(:foreman_ovirt)
+
 # Add permissions
 Foreman::AccessControl.map do |map|
   map.security_block :ovirt do |map|
@@ -24,4 +27,4 @@ ForemanOvirt::AuthSourceOvirt.transaction do
   		tls = url.scheme == "https" ? true : false
   		ForemanOvirt::AuthSourceOvirt.create(:name => name, :host => url.host, :port => url.port, :onthefly_register => true, :tls => tls)
 	end
-end
+end

data/foreman_ovirt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "foreman_ovirt"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oved Ourfali"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreman_ovirt
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Oved Ourfali