foreman_puppet 1.0.3 → 2.0.0

data/lib/foreman_puppet/register.rb

@@ -1,34 +1,50 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 2.0.0'
+  requires_foreman '>= 3.0.0'
   # Add Global JS file for extending foreman-core components and routes
   register_global_js_file 'fills'
 
-  apipie_documented_controllers(["#{ForemanPuppet::Engine.root}/app/controllers/foreman_puppet/api/v2/*.rb"])
-
-  unless ForemanPuppet.extracted_from_core?
-    # Remove core permissions
-    cfgs = %i[view_config_groups create_config_groups edit_config_groups destroy_config_groups]
-    plks = %i[view_external_parameters create_external_parameters edit_external_parameters
-              destroy_external_parameters]
-    pcls = %i[view_puppetclasses create_puppetclasses edit_puppetclasses destroy_puppetclasses import_puppetclasses]
-    (cfgs | plks | pcls).each do |perm_name|
-      p = Foreman::AccessControl.permission(perm_name)
-      Foreman::AccessControl.remove_permission(p)
+  settings do
+    category(:facts, N_('Facts')) do
+      setting('default_puppet_environment',
+        type: :string,
+        description: N_('Foreman will default to this puppet environment if it cannot auto detect one'),
+        default: 'production',
+        full_name: N_('Default Puppet environment'),
+        collection: proc { ForemanPuppet::Environment.pluck(:name).map { |name| [name, name] }.to_h })
+      setting('enc_environment',
+        type: :boolean,
+        description: N_('Foreman will explicitly set the puppet environment in the ENC yaml output. '\
+                        'This will avoid conflicts between the environment in puppet.conf and the environment set in Foreman'),
+        default: true,
+        full_name: N_('ENC environment'))
+      setting('update_environment_from_facts',
+        type: :boolean,
+        description: N_("Foreman will update a host's environment from its facts"),
+        default: false,
+        full_name: N_('Update environment from facts'))
     end
 
-    delete_menu_item(:top_menu, :puppetclasses)
-    delete_menu_item(:top_menu, :config_groups)
-    delete_menu_item(:top_menu, :puppetclass_lookup_keys)
-    delete_menu_item(:top_menu, :environments)
+    category(:cfgmgmt, N_('Config Management')) do
+      setting('puppet_interval',
+        type: :integer,
+        description: N_('Duration in minutes after servers reporting via Puppet are classed as out of sync.'),
+        default: 35,
+        full_name: N_('Puppet interval'))
+      setting('puppet_out_of_sync_disabled',
+        type: :boolean,
+        description: N_('Disable host configuration status turning to out of sync for %s after report does not arrive within configured interval') % 'Puppet',
+        default: false,
+        full_name: N_('%s out of sync disabled') % 'Puppet')
+    end
   end
 
+  apipie_documented_controllers(["#{ForemanPuppet::Engine.root}/app/controllers/foreman_puppet/api/v2/*.rb"])
+
   # TODO: maybe this would not be necessary if we rething the form
   %i[create_hostgroups edit_hostgroups].each do |perm|
     p = Foreman::AccessControl.permission(perm)
-    if ForemanPuppet.extracted_from_core?
-      p.actions << 'hostgroups/environment_selected'
-      p.actions << 'hostgroups/puppetclass_parameters'
-    end
+    p.actions << 'hostgroups/environment_selected'
+    p.actions << 'hostgroups/puppetclass_parameters'
     p.actions << 'foreman_puppet/puppetclasses/parameters'
   end
   p = Foreman::AccessControl.permission(:edit_hostgroups)
@@ -37,15 +53,13 @@ Foreman::Plugin.register :foreman_puppet do
   end
   %i[create_hosts edit_hosts].each do |perm|
     p = Foreman::AccessControl.permission(perm)
-    if ForemanPuppet.extracted_from_core?
-      p.actions << 'hosts/hostgroup_or_environment_selected'
-      p.actions << 'hosts/puppetclass_parameters'
-      if perm == :edit_hosts
-        p.actions << 'hosts/select_multiple_environment'
-        p.actions << 'hosts/update_multiple_environment'
-        p.actions << 'hosts/select_multiple_puppet_proxy'
-        p.actions << 'hosts/update_multiple_puppet_proxy'
-      end
+    p.actions << 'hosts/hostgroup_or_environment_selected'
+    p.actions << 'hosts/puppetclass_parameters'
+    if perm == :edit_hosts
+      p.actions << 'hosts/select_multiple_environment'
+      p.actions << 'hosts/update_multiple_environment'
+      p.actions << 'hosts/select_multiple_puppet_proxy'
+      p.actions << 'hosts/update_multiple_puppet_proxy'
     end
     p.actions << 'foreman_puppet/puppetclasses/parameters'
   end
@@ -168,13 +182,13 @@ Foreman::Plugin.register :foreman_puppet do
   register_facet ForemanPuppet::HostPuppetFacet, :puppet do
     configure_host do
       # extend_model ForemanPuppet::Extensions::Host
-      api_view list: 'foreman_puppet/api/v2/host_puppet_facets/base',
+      api_view list: 'foreman_puppet/api/v2/host_puppet_facets/host_list',
         single: 'foreman_puppet/api/v2/host_puppet_facets/host_single'
       template_compatibility_properties :environment, :environment_id, :environment_name
       set_dependent_action :destroy
     end
     configure_hostgroup(ForemanPuppet::HostgroupPuppetFacet) do
-      api_view list: 'foreman_puppet/api/v2/hostgroup_puppet_facets/base',
+      api_view list: 'foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_list',
         single: 'foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_single'
       template_compatibility_properties :environment, :environment_id, :environment_name
       set_dependent_action :destroy
@@ -185,14 +199,6 @@ Foreman::Plugin.register :foreman_puppet do
     base_scope.preload(puppet: :environment)
   end
 
-  unless ForemanPuppet.extracted_from_core?
-    Rails.application.config.after_initialize do
-      list = Pagelets::Manager.instance.instance_variable_get(:@pagelets)['hosts/_form'][:main_tabs]
-      core_pagelet = list.detect { |pagelet| pagelet.opts[:id] == :puppet_klasses }
-      list.delete(core_pagelet)
-    end
-  end
-
   register_graphql_query_field :environment, 'ForemanPuppet::Types::Environment', :record_field
   register_graphql_query_field :environments, 'ForemanPuppet::Types::Environment', :collection_field
   register_graphql_query_field :puppetclass, 'ForemanPuppet::Types::Puppetclass', :record_field
@@ -212,12 +218,10 @@ Foreman::Plugin.register :foreman_puppet do
         priority: 100,
         onlyif: (host_onlyif if resource_type == :host)
 
-      if ForemanPuppet.extracted_from_core?
-        context.add_pagelet :main_tab_fields,
-          partial: 'hosts/foreman_puppet/form_main_tab_fields',
-          resource_type: resource_type,
-          priority: 100
-      end
+      context.add_pagelet :main_tab_fields,
+        partial: 'hosts/foreman_puppet/form_main_tab_fields',
+        resource_type: resource_type,
+        priority: 100
     end
   end
 end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '1.0.3'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/foreman_puppet.rb

@@ -1,10 +1,5 @@
 module ForemanPuppet
-  FOREMAN_EXTRACTION_VERSION = '3.0'.freeze
-
-  def self.extracted_from_core?
-    ENV['PUPPET_EXTRACTED'].to_s == '1' ||
-      Gem::Dependency.new('', ">= #{FOREMAN_EXTRACTION_VERSION}").match?('', SETTINGS[:version].notag)
-  end
+  FOREMAN_DROP_MIGRATIONS_VERSION = '3.1'.freeze
 end
 
 require 'foreman_puppet/engine'