[PATCH/foreman 1/1] fixes #1160 - provisioning api does not contain all the sub components

Development
1

Signed-off-by: Corey Osman <corey@logicminds.biz>
Signed-off-by: Ohad Levy <ohadlevy@gmail.com>

··· From: Corey Osman --- app/models/hostgroup.rb | 2 +- app/models/operatingsystem.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/hostgroup.rb b/app/models/hostgroup.rb
index cf17420…0167ee7 100644
— a/app/models/hostgroup.rb
+++ b/app/models/hostgroup.rb
@@ -55,7 +55,7 @@ class Hostgroup < ActiveRecord::Base
end

def as_json(options={})

  • super({:only => [:name, :subnet_id, :domain_id, :id], :methods => [:label, :classes, :parameters].concat(Vm::PROPERTIES), :include => [:environment]}.merge(options))
  • super({:only => [:name, :subnet_id, :operatingsystem_id, :domain_id, :id], :methods => [:label, :classes, :parameters].concat(Vm::PROPERTIES), :include => [:environment]}.merge(options))
    end

def hostgroup
diff --git a/app/models/operatingsystem.rb b/app/models/operatingsystem.rb
index ee95c02…957796e 100644
— a/app/models/operatingsystem.rb
+++ b/app/models/operatingsystem.rb
@@ -115,7 +115,7 @@ class Operatingsystem < ActiveRecord::Base
end

def as_json(options={})

  • {:operatingsystem => {:name => to_s, :id => id, :media => media, :architectures => architectures, :ptables => ptables}}
  • {:operatingsystem => {:name => to_s, :id => id, :media => media, :architectures => architectures, :ptables => ptables, :config_templates => config_templates}}
    end

def kernel arch

1.7.6.2