katello 3.0.2 → 3.1.0.rc1

data/app/views/dashboard/_subscription_status_widget.html.erb

@@ -4,7 +4,7 @@
 
 <% organizations = Organization.current.present? ? [Organization.current] : User.current.allowed_organizations %>
 <% subscriptions = Katello::Subscription.in_organization(organizations).includes(:pools) %>
-<% total_active_subscriptions = subscriptions.select(&:active?).count %>
+<% total_active_subscriptions = organizations.map {|org| org.active_pools_count}.reduce(:+) %>
 <% total_expiring_subscriptions = subscriptions.select(&:expiring_soon?).count %>
 <% total_recently_expired_subscriptions = subscriptions.select(&:recently_expired?).count %>
 

data/app/views/foreman/smart_proxies/_content_sync.html.erb

@@ -5,7 +5,7 @@
 
   {{ syncStatusText(syncState, syncStatus) }}
   <div ng-show="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED, syncState.FAILURE)">
-    {{syncTask.progressbar.value || 0}}%
+    {{ syncTask.progressbar.value || 0 | number: 0 }}%
     <a href="<%= @task_search_url %>" target="_self">
       <div ng-class="{ active: isTaskInProgress(syncTask) }" class="progress progress-striped">
         <span progressbar

data/app/views/foreman/unattended/finish-katello.erb

@@ -42,6 +42,8 @@ echo "updating system time"
 # update all the base packages from the updates repository
 yum -t -y -e 0 update
 
+<%= snippet('remote_execution_ssh_keys') %>
+
 <% if salt_enabled %>
 yum -t -y -e 0 install salt-minion
 cat > /etc/salt/minion << EOF
@@ -60,8 +62,6 @@ cat > /etc/puppet/puppet.conf << EOF
 <%= snippet 'puppet.conf' %>
 EOF
 
-<%= snippet('remote_execution_ssh_keys') %>
-
 # Setup puppet to run on system reboot
 /sbin/chkconfig --level 345 puppet on
 

data/app/views/foreman/unattended/kickstart-katello.erb

@@ -111,6 +111,8 @@ echo "updating system time"
 # update all the base packages from the updates repository
 yum -t -y -e 0 update
 
+<%= snippet('remote_execution_ssh_keys') %>
+
 <% if salt_enabled %>
 yum -t -y -e 0 install salt-minion
 cat > /etc/salt/minion << EOF
@@ -131,8 +133,6 @@ cat > /etc/puppet/puppet.conf << EOF
 <%= snippet 'puppet.conf' %>
 EOF
 
-<%= snippet('remote_execution_ssh_keys') %>
-
 # Setup puppet to run on system reboot
 /sbin/chkconfig --level 345 puppet on
 

data/app/views/foreman/unattended/userdata-katello.erb

@@ -34,10 +34,12 @@ ssh_authorized_keys:
 <% if @host.params['sshkey'].present? -%>
   - <%= @host.params['sshkey'] %>
 <% end -%>
+<% if @host.params['remote_execution_ssh_keys'].present? -%>
 <% @host.params['remote_execution_ssh_keys'].each do |key| -%>
   - <%= key %>
 <% end -%>
 <% end -%>
+<% end -%>
 write_files:
 - path: /tmp/foreman-userdata.sh
   permissions: '0755'

data/app/views/katello/api/v2/common/_syncable.json.rabl

@@ -1,7 +1,7 @@
 attributes :sync_state, :last_sync
 
 node :last_sync_words do |object|
-  if (object.respond_to?('last_sync') && object.last_sync)
+  if object.try(:last_sync)
     time_ago_in_words(Time.parse(object.last_sync))
   end
 end

data/app/views/katello/api/v2/errata/show.json.rabl

@@ -12,8 +12,8 @@ end
 
 attributes :errata_type => :type
 
-node(:hosts_available_count) { |m| m.hosts_available.count }
-node(:hosts_applicable_count) { |m| m.hosts_applicable.count }
+node(:hosts_available_count) { |m| m.hosts_available(params[:organization_id]).count }
+node(:hosts_applicable_count) { |m| m.hosts_applicable(params[:organization_id]).count }
 
 node :packages do |e|
   e.packages.pluck(:nvrea)

data/app/views/katello/api/v2/products/base.json.rabl

@@ -9,28 +9,9 @@ attributes :provider_id
 attributes :sync_plan_id
 attributes :sync_summary
 attributes :gpg_key_id
-attributes :redhat? => :redhat
 
 attributes :available_content => :available_content, :if => params[:include_available_content]
 
-node :sync_status do |product|
-  {
-    :id => product.sync_status[:id],
-    :product_id => product.sync_status[:product_id],
-    :progress => product.sync_status[:progress],
-    :sync_id => product.sync_status[:sync_id],
-    :state => product.sync_status[:state],
-    :raw_state => product.sync_status[:raw_state],
-    :start_time => product.sync_status[:start_time],
-    :finish_time => product.sync_status[:finish_time],
-    :duration => product.sync_status[:duration],
-    :display_size => product.sync_status[:display_size],
-    :size => product.sync_status[:size],
-    :is_running => product.sync_status[:is_running],
-    :error_details => product.sync_status[:error_details]
-  }
-end
-
 child :sync_plan do
   attributes :name, :description, :sync_date, :interval, :next_sync
 end

data/app/views/katello/api/v2/products/show.json.rabl

@@ -3,12 +3,12 @@ object @resource
 
 extends "katello/api/v2/products/base"
 
-extends 'katello/api/v2/common/org_reference'
-
 attributes :productContent => :product_content
 
 attributes :available_content => :available_content
 
+attributes :redhat? => :redhat
+
 child :library_repositories => :repositories do |_repo|
   attributes :name, :id
 end
@@ -21,6 +21,25 @@ child :provider do
   attribute :name
 end
 
+node :sync_status do |product|
+  local_sync_status = product.sync_status
+  {
+    :id => local_sync_status[:id],
+    :product_id => local_sync_status[:product_id],
+    :progress => local_sync_status[:progress],
+    :sync_id => local_sync_status[:sync_id],
+    :state => local_sync_status[:state],
+    :raw_state => local_sync_status[:raw_state],
+    :start_time => local_sync_status[:start_time],
+    :finish_time => local_sync_status[:finish_time],
+    :duration => local_sync_status[:duration],
+    :display_size => local_sync_status[:display_size],
+    :size => local_sync_status[:size],
+    :is_running => local_sync_status[:is_running],
+    :error_details => local_sync_status[:error_details]
+  }
+end
+
 node :permissions do |product|
   {
     :view_products => product.readable?,

data/app/views/katello/api/v2/subscription_facet/base_with_root.json.rabl

@@ -6,4 +6,5 @@ node :content_host_id do |host|
   host.content_host.try(:id)
 end
 
-attributes :subscription_status, :subscription_status_label, :if => @object.get_status(Katello::SubscriptionStatus).relevant?
+attributes :subscription_status, :subscription_status_label, :subscription_global_status,
+           :if => @object.get_status(Katello::SubscriptionStatus).relevant?

data/app/views/katello/api/v2/subscriptions/show.json.rabl

@@ -13,34 +13,36 @@ node :provided_products, :if => lambda { |sub| sub && !sub.products.blank? } do
 end
 
 node :systems do |subscription|
-  subscription.systems.readable.map do |sys|
-    facts = sys.facts
+  subscription.hosts.map do |host|
+    facts = host.facts
     {
-      uuid: sys.uuid,
-      host_id: sys.host_id,
-      name: sys.name,
-      environment: { id: sys.environment.id, name: sys.environment.name },
-      content_view: { id: sys.content_view.id, name: sys.content_view.name },
-      created: sys.created,
-      checkin_time: sys.checkin_time,
-      entitlement_status: sys.entitlementStatus,
-      service_level: sys.serviceLevel,
-      autoheal: sys.autoheal,
+      uuid: host.subscription_facet.try(:uuid),
+      host_id: host.id,
+      name: host.name,
+      environment: { id: host.content_facet.try(:lifecycle_environment).try(:id),
+                     name: host.content_facet.try(:lifecycle_environment).try(:name) },
+      content_view: { id: host.content_facet.try(:content_view).try(:id),
+                      name: host.content_facet.try(:content_view).try(:name) },
+      created: host.subscription_facet.try(:registered_at),
+      checkin_time: host.subscription_facet.try(:last_checkin),
+      entitlement_status: host.subscription_status,
+      service_level: host.subscription_facet.try(:service_level),
+      autoheal: host.subscription_facet.try(:autoheal),
       facts: {
         dmi: {
           memory: {
-            size: facts['dmi.memory.size']
+            size: facts['dmi::memory::size']
           }
         },
         memory: {
-          memtotal: facts['memory.memtotal']
+          memtotal: facts['memory::memtotal']
         },
         cpu: {
-          'cpu_socket(s)' => facts['cpu.cpu_socket(s)'],
-          'core(s)_per_socket' => facts['cpu.core(s)_per_socket']
+          'cpu_socket(s)' => facts['cpu::cpu_socket(s)'],
+          'core(s)_per_socket' => facts['cpu::core(s)_per_socket']
         },
         virt: {
-          is_guest: facts['virt.is_guest']
+          is_guest: facts['virt::is_guest']
         }
       }
     }

data/config/katello.yml

@@ -0,0 +1,242 @@
+# This file contains default values for Katello configuration.
+#
+# DO NOT EDIT THIS FILE
+#
+# Add `/etc/katello/katello.yml` (or `config/katello.yml` in development) to override default values,
+# file is required even if it's blank.
+
+# Katello configuration
+#
+# :vim:sw=2:ts=2:et:
+
+# Common configuration
+#
+# The following configuration values are the same for production, test
+# and development environments. Values can be overridden bellow.
+#
+common:
+  ssl_client_key: '/etc/pki/katello/private/abed.usersys.redhat.com-pulp-client.key'
+  ssl_client_cert: '/etc/pki/katello/certs/abed.usersys.redhat.com-pulp-client.crt'
+  use_cp: # set to true/false if you want to override default
+  use_pulp: # set to true/false if you want to override default
+  use_elasticsearch: # set to true/false if you want to override default
+
+  rest_client_timeout: 30
+  gpg_strict_validation: false
+
+  # Puppet publishing location
+  puppet_repo_root: '/etc/puppet/environments/'
+
+  elastic_index: katello
+  elastic_url: http://localhost:9200
+
+  post_sync_url: "http://localhost:3000/katello/api/v2/repositories/sync_complete?token=katello"
+
+  simple_search_tokens: [":", " and\\b", " or\\b", " not\\b"]
+
+  redhat_repository_url: https://cdn.redhat.com
+  redhat_docker_registry_url: https://registry.access.redhat.com
+
+  qpid:
+    url: amqp:ssl:troy.usersys.redhat.com:5671
+    subscriptions_queue_address: katello_event_queue
+
+  consumer_cert_rpm: 'katello-ca-consumer-latest.noarch.rpm'
+
+  #setup how often you want
+  #your notifications to be checked
+  #for you to receive the right notifications
+  #default value = 45 seconds
+  #
+  notification:
+    polling_seconds: 120
+
+  # Setup your candlepin environment here
+  candlepin:
+    # refers to the url of the candlepin
+    # example https://localhost:8443/candlepin
+    url: https://localhost:8443/candlepin
+
+    # Specify your oauth key and secret used to authenticate between Katello and Candlepin
+    oauth_key: katello
+    oauth_secret: katello
+
+    # refers to the candlepin-ca.crt location that is needed
+    # to connect to candlepin over https.This is not necessary
+    # if the candlepin server is running on the same machine as katello
+    # but required if the server is on a different machine.
+    # In the different machine case the katello host needs to have a
+    # copy of /etc/candlepin/certs/candlepin-ca.crt copied from
+    # the candlepin host and the location of the copied file needs to be
+    # specified here..
+    ca_cert_file:
+
+  # Setup your pulp environment here
+  pulp:
+    # refers to the url of the pulp
+    # example https://localhost/pulp/api
+    url: https://localhost/pulp/api/v2/
+
+    # Specify your oauth key and secret used to authenticate between Katello and Pulp
+    oauth_key: katello
+    oauth_secret: katello
+
+    sync_threads: 4
+    bulk_load_size: 100
+    # refers to the apache certificate
+    # (typically /etc/pki/tls/certs/localhost.crt) location that is needed
+    # to connect to pulp over https.
+    ca_cert_file:
+    default_login: admin
+    sync_KBlimit:
+    upload_chunk_size: 1048575 # upload size in bytes to pulp. see SSLRenegBufferSize in apache
+    skip_checksum_validation: false
+
+  # Setup proxy to use when accessing CDN.
+  # Katello calls CDN to retrieve list of repositories for a product
+  # Uncomment in case you want this calls to go through your proxy
+  cdn_proxy:
+  #    host: localhost
+  #    port: 3128
+  #    user: login
+  #    password: password
+
+  # when adding a new logger don't forget to add it in here even if it's disabled by default
+  # otherwise log trace feature won't work for such logger
+  logging:
+    # enable logging output inline in rails console
+    console_inline: true
+    # colorize log including level token based on severity
+    colorize: false
+    # adds an extra line after each log message with information from which file:line and method
+    # was this message logged
+    log_trace: false
+    #do not log certain paths (example  /notices/get_new)
+    ignored_paths: []
+    # configuration of all loggers used in app
+    loggers:
+      # this logger is parent of all other loggers, by default this is the only one having appender
+      # which is used by all other loggers
+      root:
+        # only messages with severity >= this level from all loggers will be logged
+        level: warn
+        # file or syslog, for file variant you can specify other options below like filename,
+        # pattern or rolling options
+        type: file
+        # 'daily', 'weekly', 'monthly' or number as seconds
+        age: 'weekly'
+        # how many old log files to keep (156 = 52 * 3 = 3 years for weekly age)
+        keep: 156
+        # logger line pattern, you can use following macros
+        #  [%c] name of the logger that generate the log event
+        #  [%d] datestamp
+        #  [%m] the user supplied log message
+        #  [%p] PID of the current process
+        #  [%r] the time in milliseconds since the program started
+        #  [%T] the name of the thread Thread.current[:name]
+        #  [%t] object_id of the thread
+        #  [%F] filename where the logging request was issued
+        #  [%L] line number where the logging request was issued
+        #  [%M] method name where the logging request was issued
+        #  [%X{string}] variable set using ::Logging.mdc['string'] =
+        pattern: "[%5l %d %c %X{uuid} #%p] %m\n"
+        # log filename for this environment, it will be placed into #{Rails.root}/log directory
+        filename: "production.log"
+        # you log files will be stored here
+        # note when you log outside of standard rails path you won't see log output in WEBrick
+        # STDOUT (usually not wanted in development), to use Rails default path, don't set path
+        # path: /var/log/katello
+
+      # you can configure each logger individually, you can turn it off completely by using key
+      # 'enabled' or you can adjust it's logging 'level'. If you specify level higher than root
+      # logger has, messages below this level are ignored. If you specify lower level than root
+      # they are still ignored but you can add appender in Katello::Logging just for this logger
+      # and see these logs outside of main log.
+      sql:
+        enabled: false
+      app:
+        enabled: true
+      glue:
+        enabled: true
+      pulp_rest:
+        enabled: true
+      cp_rest:
+        enabled: true
+      cp_proxy:
+        enabled: true
+      foreman_rest:
+        enabled: true
+      action:
+        enabled: true
+      # tire is a special case, all logs coming from it are debug level however they count depends
+      # on root level configuration, e.g. root debug level will print most info from tire
+      # unfortunately there is currently no better way
+      tire_rest:
+        enabled: false
+      yard:
+        enabled: false
+#
+# Production environment configuration
+#
+# The following configuration values override ones from the common section
+#
+production:
+  logging:
+    loggers:
+      sql:
+        level: fatal
+
+#
+# Development environment configuration
+#
+# The following configuration values override ones from the common section
+#
+development:
+  logging:
+    ignored_paths: ['/notices/get_new', '/assets/', '/api/tasks/bulk_search']
+    colorize: true
+    loggers:
+      root:
+        level: debug
+        type: file
+        age: 'monthly'
+        keep: 1
+        pattern: "[%5l %d %c] %m\n"
+        filename: "development.log"
+      yard:
+        level: info
+
+      # To enable external logs tailing add optional 'tail_command:' option to a logger configuration,
+      # standard output of the command is logged. Useful with `tail` command. E.g.
+      #
+      # tail-pulp:
+      #   enabled: true
+      #   tail_command: ssh root@a_host -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tail -f /var/log/pulp/pulp.log
+      # tail-cp:
+      #   enabled: true
+      #   tail_command: ssh root@a_host -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tail -f /var/log/tomcat6/catalina.out
+      # tail-kt-client:
+      #   enabled: true
+      #   tail_command: tail -f ~/.katello/client.log
+      # tail-foreman:
+      #   enabled: true
+      #   tail_command: tail -f ~/Workspace/redhat/foreman/log/development.log
+
+
+#
+# Test environment configuration
+#
+# The following configuration values override ones from the common section
+#
+test:
+  elastic_index: katello_test
+  logging:
+    colorize: false
+    loggers:
+      root:
+        level: debug
+        type: file
+        age: 'monthly'
+        keep: 1
+        pattern: "[%5l %d %c] %m\n"
+        filename: "test.log"