katello 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f67a786159867d60c20979f0602bb3863524e0
-  data.tar.gz: dd24b2382a538d7153d4ebaa76f237e18fdcd811
+  metadata.gz: f6c7354acf1a09805b67a419f1ad8d278412093f
+  data.tar.gz: da753c9a5489643551c0a05cb4e7b545af75c8c4
 SHA512:
-  metadata.gz: 30ddccbb6ff1bc0cffa457ee04d0d0284d350893286f88814a87a616a3d3824742f2d45e1aae77c8f07341f9f7827357dd660f456de87a9a4e5d3098578d8eab
-  data.tar.gz: f0c4848493c531015c3b321b37aa18b0ea3ce9a0e59900a07bc51324571f36a033e20daf7307b2a81a8fca29e0c715f22fc0424b5bee5454d9fbfb9f1e6c3a92
+  metadata.gz: 23abb876559fd4263c4932656665b5371953a7eec6d8751a7c2d4609221cb89a4e924a9932f9363d9700ce4b8a97717be39062387d9f7eba8495198db1180552
+  data.tar.gz: 7fc67b386840c7d21306a2e879cf7c65afba6e31393e7b0b50124813e0d6b0cd9227ee057b27a2ff83704eee0120423e77bab116223703aa1b1527304b3c4079

data/lib/katello/engine.rb

@@ -201,6 +201,7 @@ module Katello
       load "#{Katello::Engine.root}/lib/katello/tasks/asset_compile.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/clean_backend_objects.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/preupgrade_content_host_check.rake"
+      load "#{Katello::Engine.root}/lib/katello/tasks/upgrade_check.rake"
 
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.1/import_errata.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.2/update_gpg_key_urls.rake"

data/lib/katello/tasks/preupgrade_content_host_check.rake

@@ -7,7 +7,6 @@ namespace :katello do
       fail _("Some backend services are not running: %s") % ping.inspect
     end
 
-    puts "This script makes no modifications and can be re-run multiple times for the most up to date results."
     puts "Calculating Host changes on upgrade.  This may take a few minutes."
 
     User.current = User.anonymous_api_admin
@@ -125,7 +124,5 @@ namespace :katello do
     else
       puts "Upgrading will not affect any of your Content Hosts."
     end
-
-    FileUtils.touch('/var/lib/foreman/3.0_upgrade_ready')
   end
-end
+end

data/lib/katello/tasks/upgrade_check.rake

@@ -0,0 +1,35 @@
+DESIRED_VERSION = "2.4.2"
+CP_LISTEN_ACTION = "Actions::Candlepin::ListenOnCandlepinEvents"
+
+def current_version
+  Katello::VERSION
+end
+
+namespace :katello do
+  task :upgrade_check => ['environment'] do
+    desc "Task that can be run before upgrading to Katello 3.0 to check if system is upgrade ready"
+    success = "PASS"
+    fail = "FAIL"
+
+    puts "This script makes no modifications and can be re-run multiple times for the most up to date results."
+    puts "Checking upgradeability...\n\n"
+
+    # check for any running tasks
+    task_count = ::ForemanTasks::Task.active.where("label != '#{CP_LISTEN_ACTION}'").count
+    task_status = task_count > 1 ? fail : success
+    puts "Checking for running tasks..."
+    puts "[#{task_status}] - There are #{task_count} active tasks.\n\n"
+
+    # check the current version
+    version_status = current_version == DESIRED_VERSION ? success : fail
+    puts "Checking the current version..."
+    puts "[#{version_status}] - Current version of Katello is #{current_version} " \
+      "and needs to be #{DESIRED_VERSION}\n\n"
+
+    # run the content host check
+    puts "Checking content hosts..."
+    Rake::Task["katello:preupgrade_content_host_check"].invoke
+
+    FileUtils.touch('/var/lib/foreman/3.0_upgrade_ready')
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1142,7 +1142,6 @@ files:
 - config/initializers/rabl_init.rb
 - config/initializers/runcible.rb
 - config/katello.yaml.example
-- config/katello.yml
 - config/katello_defaults.yml
 - config/locales/README
 - config/locales/bn.yml
@@ -1735,6 +1734,7 @@ files:
 - lib/katello/tasks/setup.rake
 - lib/katello/tasks/simplecov.rake
 - lib/katello/tasks/test.rake
+- lib/katello/tasks/upgrade_check.rake
 - lib/katello/tasks/upgrades/2.1/import_errata.rake
 - lib/katello/tasks/upgrades/2.2/update_gpg_key_urls.rake
 - lib/katello/tasks/upgrades/2.2/update_metadata_expire.rake

data/config/katello.yml

@@ -1,242 +0,0 @@
-# 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"