katello 4.9.2 → 4.10.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-packages.html

@@ -29,9 +29,20 @@
     <button type="button" class="btn btn-default"
             ng-hide="denied('edit_products')"
             ng-click="openModal()"
-            ng-disabled="table.working || table.numSelected === 0">
+            ng-disabled="table.working || table.numSelected === 0 || product.redhat">
       <i class="fa fa-trash-o" ng-hide="table.working"></i>
-      <span translate>Remove Packages</span>
+      <span ng-hide="product.redhat" translate>Remove Packages</span>
+      <span ng-show="product.redhat">
+            <span translate>Cannot Remove</span>
+            <span>
+              <i class="fa fa-question-circle" ng-show="product.redhat"
+                 uib-tooltip="{{ 'You cannot remove content from a redhat repository' | translate }}"
+                 tooltip-animation="false"
+                 tooltip-placement="left"
+                 tooltip-append-to-body="true">
+              </i>
+            </span>
+      </span>
     </button>
   </div>
 

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -40,10 +40,8 @@ module BastionKatello
         :config_generator =>  lambda do
           { 'consumerCertRPM' => consumer_cert_rpm,
             'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
-            'katelloAgentPresent' => ::Katello.with_katello_agent?,
             'remoteExecutionPresent' => ::Katello.with_remote_execution?,
-            'hostToolingEnabled' => (::Katello.with_katello_agent? || ::Katello.with_remote_execution?) ? true : false,
-            'remoteExecutionByDefault' => ::Katello.remote_execution_by_default?
+            'hostToolingEnabled' => ::Katello.with_remote_execution?
           }
         end
       )

data/lib/katello/engine.rb

@@ -55,14 +55,6 @@ module Katello
           :queue_name => 'katello.candlepin',
           :subscription_name => 'candlepin_events',
           :client_id => 'katello_candlepin_event_monitor'
-        },
-        :agent => {
-          :client_queue_format => 'pulp.agent.%s',
-          :event_queue_name => 'katello.agent',
-          :broker_url => 'amqps://localhost:5671',
-          :broker_ssl_cert_file => SETTINGS[:ssl_certificate],
-          :broker_ssl_key_file => SETTINGS[:ssl_priv_key],
-          :broker_ssl_ca_file => SETTINGS[:ssl_ca_file]
         }
       }
 
@@ -148,7 +140,6 @@ module Katello
 
       Katello::EventDaemon::Runner.register_service(:candlepin_events, Katello::CandlepinEventListener)
       Katello::EventDaemon::Runner.register_service(:katello_events, Katello::EventMonitor::PollerThread)
-      Katello::EventDaemon::Runner.register_service(:katello_agent_events, Katello::EventDaemon::Services::AgentEventReceiver) if ::Katello.with_katello_agent?
 
       # Lib Extensions
       ::Foreman::Renderer::Scope::Variables::Base.include Katello::Concerns::RendererExtensions
@@ -226,7 +217,6 @@ module Katello
       Katello::EventQueue.register_event(Katello::Events::AutoPublishCompositeView::EVENT_TYPE, Katello::Events::AutoPublishCompositeView)
       Katello::EventQueue.register_event(Katello::Events::DeleteLatestContentViewVersion::EVENT_TYPE, Katello::Events::DeleteLatestContentViewVersion)
       Katello::EventQueue.register_event(Katello::Events::GenerateHostApplicability::EVENT_TYPE, Katello::Events::GenerateHostApplicability)
-      Katello::EventQueue.register_event(Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, Katello::Events::DeleteHostAgentQueue)
       Katello::EventQueue.register_event(Katello::Events::DeletePool::EVENT_TYPE, Katello::Events::DeletePool)
     end
 
@@ -242,14 +232,6 @@ module Katello
     Foreman::Plugin.installed?("foreman_remote_execution")
   end
 
-  def self.with_katello_agent?
-    !!SETTINGS.dig(:katello, :agent, :enabled)
-  end
-
-  def self.remote_execution_by_default?
-    self.with_katello_agent? ? Setting['remote_execution_by_default'] : true
-  end
-
   def self.with_ansible?
     Foreman::Plugin.installed?("foreman_ansible")
   end

data/lib/katello/permission_creator.rb

@@ -404,7 +404,7 @@ module Katello
       @plugin.permission :edit_alternate_content_sources,
                          {
                            'katello/api/v2/alternate_content_sources' => [:update, :refresh],
-                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:refresh_alternate_content_sources]
+                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:refresh_alternate_content_sources, :refresh_all_alternate_content_sources]
                          },
                          :resource_type => 'Katello::AlternateContentSource',
                          :finder_scope => :editable

data/lib/katello/plugin.rb

@@ -242,7 +242,6 @@ Foreman::Plugin.register :katello do
   logger :registry_proxy, :enabled => true
   logger :katello_events, :enabled => true
   logger :candlepin_events, :enabled => true
-  logger :agent, :enabled => true
 
   widget 'errata_widget', :name => 'Latest Errata', :sizey => 1, :sizex => 6
   widget 'content_views_widget', :name => 'Content Views', :sizey => 1, :sizex => 6
@@ -457,18 +456,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Timeout when refreshing a manifest (in seconds)'),
         description: N_("Manifest refresh timeout")
 
-      setting 'content_action_accept_timeout',
-        type: :integer,
-        default: 20,
-        full_name: N_('Accept action timeout'),
-        description: N_("Time in seconds to wait for a host to pick up a katello-agent action")
-
-      setting 'content_action_finish_timeout',
-        type: :integer,
-        default: 3600,
-        full_name: N_('Finish action timeout'),
-        description: N_("Time in seconds to wait for a host to finish a katello-agent action")
-
       setting 'subscription_connection_enabled',
         type: :boolean,
         default: true,
@@ -575,12 +562,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Sync Sock Read Timeout'),
         description: N_("The maximum number of seconds that Pulp can take to download a file, not counting connection time.")
 
-      setting 'remote_execution_by_default',
-        type: :boolean,
-        default: false,
-        full_name: N_('Use remote execution by default'),
-        description: N_("If this is enabled, remote execution is used instead of katello-agent for remote actions")
-
       setting 'unregister_delete_host',
         type: :boolean,
         default: false,
@@ -612,12 +593,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Expire soon days'),
         description: N_('The number of days remaining in a subscription before you will be reminded about renewing it.')
 
-      setting 'content_view_solve_dependencies',
-        type: :boolean,
-        default: false,
-        full_name: N_('content view Dependency Solving Default'),
-        description: N_('The default dependency solving value for new content views.')
-
       setting 'host_dmi_uuid_duplicates',
         type: :array,
         default: [],

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.9.2".freeze
+  VERSION = "4.10.0.rc1".freeze
 end

data/lib/monkeys/remove_hidden_distribution.rb

@@ -0,0 +1,383 @@
+require 'pulp_rpm_client'
+require 'pulp_container_client'
+require 'pulp_ostree_client'
+require 'pulp_file_client'
+require 'pulp_deb_client'
+require 'pulp_ansible_client'
+require 'pulp_python_client'
+
+PulpPythonClient::PythonPythonDistribution.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    if (!attributes.is_a?(Hash))
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpPythonClient::PythonPythonDistribution` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h|
+      if (!self.class.attribute_map.key?(k.to_sym))
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpPythonClient::PythonPythonDistribution`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    }
+
+    if attributes.key?(:'base_path')
+      self.base_path = attributes[:'base_path']
+    end
+
+    if attributes.key?(:'content_guard')
+      self.content_guard = attributes[:'content_guard']
+    end
+
+    if attributes.key?(:'hidden')
+      self.hidden = attributes[:'hidden']
+    # Monkey-patch here. The rest of the initializer is copied from the library code.
+    #else
+    #  self.hidden = false
+    end
+
+    if attributes.key?(:'pulp_labels')
+      if (value = attributes[:'pulp_labels']).is_a?(Hash)
+        self.pulp_labels = value
+      end
+    end
+
+    if attributes.key?(:'name')
+      self.name = attributes[:'name']
+    end
+
+    if attributes.key?(:'repository')
+      self.repository = attributes[:'repository']
+    end
+
+    if attributes.key?(:'publication')
+      self.publication = attributes[:'publication']
+    end
+
+    if attributes.key?(:'allow_uploads')
+      self.allow_uploads = attributes[:'allow_uploads']
+    else
+      self.allow_uploads = true
+    end
+
+    if attributes.key?(:'remote')
+      self.remote = attributes[:'remote']
+    end
+  end
+end
+
+PulpAnsibleClient::AnsibleAnsibleDistribution.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    if (!attributes.is_a?(Hash))
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpAnsibleClient::AnsibleAnsibleDistribution` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h|
+      if (!self.class.attribute_map.key?(k.to_sym))
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpAnsibleClient::AnsibleAnsibleDistribution`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    }
+
+    if attributes.key?(:'base_path')
+      self.base_path = attributes[:'base_path']
+    end
+
+    if attributes.key?(:'content_guard')
+      self.content_guard = attributes[:'content_guard']
+    end
+
+    if attributes.key?(:'hidden')
+      self.hidden = attributes[:'hidden']
+    # Monkey-patch here. The rest of the initializer is copied from the library code.
+    #else
+    #  self.hidden = false
+    end
+
+    if attributes.key?(:'name')
+      self.name = attributes[:'name']
+    end
+
+    if attributes.key?(:'repository')
+      self.repository = attributes[:'repository']
+    end
+
+    if attributes.key?(:'repository_version')
+      self.repository_version = attributes[:'repository_version']
+    end
+
+    if attributes.key?(:'pulp_labels')
+      if (value = attributes[:'pulp_labels']).is_a?(Hash)
+        self.pulp_labels = value
+      end
+    end
+  end
+end
+
+PulpRpmClient::RpmRpmDistribution.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    if (!attributes.is_a?(Hash))
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpRpmClient::RpmRpmDistribution` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h|
+      if (!self.class.attribute_map.key?(k.to_sym))
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpRpmClient::RpmRpmDistribution`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    }
+
+    if attributes.key?(:'base_path')
+      self.base_path = attributes[:'base_path']
+    end
+
+    if attributes.key?(:'content_guard')
+      self.content_guard = attributes[:'content_guard']
+    end
+
+    if attributes.key?(:'hidden')
+      self.hidden = attributes[:'hidden']
+    # Monkey-patch here. The rest of the initializer is copied from the library code.
+    #else
+    #  self.hidden = false
+    end
+
+    if attributes.key?(:'pulp_labels')
+      if (value = attributes[:'pulp_labels']).is_a?(Hash)
+        self.pulp_labels = value
+      end
+    end
+
+    if attributes.key?(:'name')
+      self.name = attributes[:'name']
+    end
+
+    if attributes.key?(:'repository')
+      self.repository = attributes[:'repository']
+    end
+
+    if attributes.key?(:'publication')
+      self.publication = attributes[:'publication']
+    end
+  end
+end
+
+PulpContainerClient::ContainerContainerDistribution.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    if (!attributes.is_a?(Hash))
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpContainerClient::ContainerContainerDistribution` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h|
+      if (!self.class.attribute_map.key?(k.to_sym))
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpContainerClient::ContainerContainerDistribution`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    }
+
+    if attributes.key?(:'pulp_labels')
+      if (value = attributes[:'pulp_labels']).is_a?(Hash)
+        self.pulp_labels = value
+      end
+    end
+
+    if attributes.key?(:'content_guard')
+      self.content_guard = attributes[:'content_guard']
+    end
+
+    if attributes.key?(:'repository')
+      self.repository = attributes[:'repository']
+    end
+
+    if attributes.key?(:'name')
+      self.name = attributes[:'name']
+    end
+
+    if attributes.key?(:'hidden')
+      self.hidden = attributes[:'hidden']
+    # Monkey-patch here. The rest of the initializer is copied from the library code.
+    #else
+    #  self.hidden = false
+    end
+
+    if attributes.key?(:'base_path')
+      self.base_path = attributes[:'base_path']
+    end
+
+    if attributes.key?(:'repository_version')
+      self.repository_version = attributes[:'repository_version']
+    end
+
+    if attributes.key?(:'private')
+      self.private = attributes[:'private']
+    end
+
+    if attributes.key?(:'description')
+      self.description = attributes[:'description']
+    end
+  end
+end
+
+PulpFileClient::FileFileDistribution.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    if (!attributes.is_a?(Hash))
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpFileClient::FileFileDistribution` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h|
+      if (!self.class.attribute_map.key?(k.to_sym))
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpFileClient::FileFileDistribution`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    }
+
+    if attributes.key?(:'base_path')
+      self.base_path = attributes[:'base_path']
+    end
+
+    if attributes.key?(:'content_guard')
+      self.content_guard = attributes[:'content_guard']
+    end
+
+    if attributes.key?(:'hidden')
+      self.hidden = attributes[:'hidden']
+    # Patch here.
+    #else
+      #self.hidden = false
+    end
+
+    if attributes.key?(:'pulp_labels')
+      if (value = attributes[:'pulp_labels']).is_a?(Hash)
+        self.pulp_labels = value
+      end
+    end
+
+    if attributes.key?(:'name')
+      self.name = attributes[:'name']
+    end
+
+    if attributes.key?(:'repository')
+      self.repository = attributes[:'repository']
+    end
+
+    if attributes.key?(:'publication')
+      self.publication = attributes[:'publication']
+    end
+  end
+end
+
+PulpDebClient::DebAptDistribution.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    if (!attributes.is_a?(Hash))
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpDebClient::DebAptDistribution` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h|
+      if (!self.class.attribute_map.key?(k.to_sym))
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpDebClient::DebAptDistribution`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    }
+
+    if attributes.key?(:'base_path')
+      self.base_path = attributes[:'base_path']
+    end
+
+    if attributes.key?(:'content_guard')
+      self.content_guard = attributes[:'content_guard']
+    end
+
+    if attributes.key?(:'hidden')
+      self.hidden = attributes[:'hidden']
+    # Patch here.
+    #else
+    #  self.hidden = false
+    end
+
+    if attributes.key?(:'pulp_labels')
+      if (value = attributes[:'pulp_labels']).is_a?(Hash)
+        self.pulp_labels = value
+      end
+    end
+
+    if attributes.key?(:'name')
+      self.name = attributes[:'name']
+    end
+
+    if attributes.key?(:'repository')
+      self.repository = attributes[:'repository']
+    end
+
+    if attributes.key?(:'publication')
+      self.publication = attributes[:'publication']
+    end
+  end
+end
+
+
+PulpOstreeClient::OstreeOstreeDistribution.class_eval do
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    if (!attributes.is_a?(Hash))
+      fail ArgumentError, "The input argument (attributes) must be a hash in `PulpOstreeClient::OstreeOstreeDistribution` initialize method"
+    end
+
+    # check to see if the attribute exists and convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h|
+      if (!self.class.attribute_map.key?(k.to_sym))
+        fail ArgumentError, "`#{k}` is not a valid attribute in `PulpOstreeClient::OstreeOstreeDistribution`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      end
+      h[k.to_sym] = v
+    }
+
+    if attributes.key?(:'base_path')
+      self.base_path = attributes[:'base_path']
+    end
+
+    if attributes.key?(:'content_guard')
+      self.content_guard = attributes[:'content_guard']
+    end
+
+    if attributes.key?(:'hidden')
+      self.hidden = attributes[:'hidden']
+    # Monkey-patch here. The rest of the initializer is copied from the library code.
+    #else
+    #  self.hidden = false
+    end
+
+    if attributes.key?(:'pulp_labels')
+      if (value = attributes[:'pulp_labels']).is_a?(Hash)
+        self.pulp_labels = value
+      end
+    end
+
+    if attributes.key?(:'name')
+      self.name = attributes[:'name']
+    end
+
+    if attributes.key?(:'repository')
+      self.repository = attributes[:'repository']
+    end
+
+    if attributes.key?(:'repository_version')
+      self.repository_version = attributes[:'repository_version']
+    end
+  end
+end

data/locale/action_names.rb

@@ -6,6 +6,7 @@ _("Agent action")
 _("Attach subscriptions")
 _("Auto attach subscriptions")
 _("Bulk generate applicability for hosts")
+_("Check for long running tasks")
 _("Combined Profile Update")
 _("Copy version units to library")
 _("Create Alternate Content Source")
@@ -17,6 +18,7 @@ _("Delete Activation Key")
 _("Delete Lifecycle Environment")
 _("Delete Product")
 _("Delete")
+_("Deliver notifications about long running tasks")
 _("Destroy Alternate Content Source")
 _("Destroy Content Host")
 _("Destroy")
@@ -80,4 +82,4 @@ _("Update release version for host")
 _("Update")
 _("Updating System Purpose for host")
 _("Upload into")
-_("Verify checksum")
+_("Verify checksum")