Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master cherry picks for 3.6.1 #4814

Merged
merged 11 commits into from
Aug 9, 2017
Merged

master cherry picks for 3.6.1 #4814

merged 11 commits into from
Aug 9, 2017

Commits on Jul 27, 2017

  1. add etcd increased-traffic check

    juanvallejo authored and sosiouxme committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    7b53fb2 View commit details
    Browse the repository at this point in the history
  2. Fix broken link to Docker image instructions

    And document that one needs to install dependencies before running playbooks.
    rhcarvalho authored and sosiouxme committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    e627a25 View commit details
    Browse the repository at this point in the history
  3. image builds: remove dependency on playbook2image

    We do not need the builder functionality from playbook2image and the
    resulting image was overly complicated, so this simply builds on
    Centos/RHEL.
    juanvallejo authored and sosiouxme committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    6ff80ce View commit details
    Browse the repository at this point in the history
  4. verify sane log times in logging stack

    This patch verifies that logs sent from logging pods can be queried on
    the Elasticsearch pod within a reasonable amount of time.
    juanvallejo authored and sosiouxme committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    b3d4b2a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b297307 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7cb954b View commit details
    Browse the repository at this point in the history
  7. openshift_checks: refactor to internalize task_vars

    Move task_vars into instance variable so we don't have to pass it
    around everywhere. Also store tmp. Make sure both are filled in on
    execute_module.
    
    In the process, is_active became an instance method, and task_vars is
    basically never used directly outside of test code.
    sosiouxme committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    417cdc9 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Configuration menu
    Copy the full SHA
    234406e View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Misc cleanup and input normalization

    Clean up openshift-checks playbooks
    
    - The referenced issue was closed, seems like a wontfix. Just use the
    old syntax and make no noise about it.
    - Remove inconsistent use of tags: if tags are passed in the command
    line, there is no point in evaluating groups if the checks won't be run
    anyway.
    - Remove temporal comment, easy to get out of sync.
    
    Make LoggingCheck.run return the correct type
    
    The run method is expected to return a dict. Even though we should not
    run LoggingCheck by itself, it is still possible to do it and without
    this change we get an unhandled exception.
    
    Clean up unnecessary quotes
    
    Normalize list of checks passed to action plugin
    
    This allows users to pass either a string with comma-separated check
    names or a proper list of strings, whatever is more convenient in the
    context.
    
    For consistency, the same normalization is applied to the
    'openshift_disable_check' variable.
    rhcarvalho authored and sosiouxme committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    c00000e View commit details
    Browse the repository at this point in the history
  2. package_version check: tolerate release version 3.7

    Addresses issue #4967
    
    For now, any version >= 3.6 is handled as if it were 3.6. We may want to
    keep that or fine-tune it later.
    
    Also, the ovs_version check is not updated. This is a post-install
    health check (does not block install/upgrade) with an update already in
    progress so will be addressed there.
    sosiouxme committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    ccccf80 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Origin image build: add oc client

    The oc client was left out with the move away from playbook2image.
    However it is needed in the image for the `oc cluster up` use case for
    installing logging or metrics.
    
    This change adds oc via the latest signed and released client RPM,
    which requires adding the centos-openshift-origin repo to the image.
    sosiouxme committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    c1f6dc8 View commit details
    Browse the repository at this point in the history