Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3506 from harobed/issue_3505 | Scott Dodson | 2017-02-27 | 1 | -2/+2 |
|\ | | | | | Fix issue #3505, add notes about origin upgrade versions support in BYO upgrade README file | ||||
| * | Fix issue #3505, add notes about origin upgrade versions support in BYO ↵ | Stéphane Klein | 2017-02-27 | 1 | -2/+2 |
|/ | | | | upgrade README file | ||||
* | Merge pull request #3358 from jpkrohling/JPK-JGroups-ASYM-Password | Scott Dodson | 2017-02-27 | 4 | -43/+12 |
|\ | | | | | Removed JGroups cert and password generation. | ||||
| * | Removed JGroups cert and password generation. | Juraci Paixão Kröhling | 2017-02-24 | 4 | -43/+12 |
| | | |||||
* | | Merge pull request #3468 from jcantrill/logging_expand_replicas | Scott Dodson | 2017-02-27 | 1 | -1/+1 |
|\ \ | | | | | | | openshift_logging default to 2 replicas of primary shards | ||||
| * | | openshift_logging default to 2 replicas of primary shards | Jeff Cantrill | 2017-02-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3448 from smarterclayton/version | Scott Dodson | 2017-02-24 | 5 | -20/+22 |
|\ \ \ | | | | | | | | | Prepare for origin moving to OCP version scheme | ||||
| * | | | Prepare for origin moving to OCP version scheme | Clayton Coleman | 2017-02-23 | 5 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | Origin 1.6 and future releases will be versioned as Origin 3.6+. This unifies a point of inconsistency and brings Origin in line with the full release history. Update version numbers to match that 3.x is preferred. | ||||
* | | | | Merge pull request #3423 from mtnbikenc/openshift-hosted | Scott Dodson | 2017-02-24 | 9 | -414/+274 |
|\ \ \ \ | | | | | | | | | | | [openshift_hosted] Router/Registry | ||||
| * | | | | openshift_hosted: Update tasks to use oc_ modules | Russell Teague | 2017-02-24 | 9 | -414/+274 |
|/ / / / | |||||
* | | | | Merge pull request #3467 from kwoodson/registry_updates | Kenny Woodson | 2017-02-24 | 7 | -4/+80 |
|\ \ \ \ | | | | | | | | | | | Fixed default variables. Added a fix to generated secret in env var. | ||||
| * | | | | Rebased. | Kenny Woodson | 2017-02-24 | 4 | -4/+4 |
| | | | | | |||||
| * | | | | Fixed indentation | Kenny Woodson | 2017-02-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Adding get_env_var to deploymentconfig. | Kenny Woodson | 2017-02-24 | 6 | -66/+68 |
| | | | | | |||||
| * | | | | Fixed default variables. Added a fix to generated secret in env var. | Kenny Woodson | 2017-02-24 | 7 | -4/+78 |
| | | | | | |||||
* | | | | | Merge pull request #3486 from tbielawa/bz1421053 | Andrew Butcher | 2017-02-24 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix Quick Installer failed due to a Python method failure | ||||
| * | | | | Fix Quick Installer failed due to a Python method failure | Tim Bielawa | 2017-02-24 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues dumping various objects to YAML. This change updates the quick installer fact caching callback to use the improved AnsibleDumper when writing out the facts to storage. * https://bugzilla.redhat.com/show_bug.cgi?id=1421053 * https://bugzilla.redhat.com/show_bug.cgi?id=1421061 * https://bugzilla.redhat.com/show_bug.cgi?id=1421059 | ||||
* | | | | | Merge pull request #3487 from sdodson/drop-centos-paas-sig-common | Scott Dodson | 2017-02-24 | 1 | -7/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Revert "Add centos paas sig common" | ||||
| * | | | | Revert "Add centos paas sig common" | Scott Dodson | 2017-02-24 | 1 | -7/+0 |
|/ / / / | | | | | | | | | | | | | This reverts commit 7a16f20b936546f47df87662c78f7fe12e75fe85. | ||||
* | | | | Merge pull request #3457 from sdodson/1414276 | Scott Dodson | 2017-02-24 | 2 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | BZ1414276 - Quote ansible_ssh_user when determining group id | ||||
| * | | | BZ1414276 - Quote ansible_ssh_user when determining group id | Scott Dodson | 2017-02-22 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | So that domain users of the format 'dom\user' may be used for ansible_ssh_user | ||||
* | | | | Merge pull request #3430 from jcantrill/bz_1417261_quote_secret | Scott Dodson | 2017-02-24 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | bug 1417261. Quote name and secrets in logging templates | ||||
| * | | | | bug 1417261. Quote name and secrets in logging templates | Jeff Cantrill | 2017-02-20 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3483 from ingvagabund/fix-symlink-to-lookups-in-spec-file | Scott Dodson | 2017-02-24 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix symlink to lookup_plugins/oo_option.py | ||||
| * | | | | | Fix symlink to lookup_plugins/oo_option.py | Jan Chaloupka | 2017-02-24 | 1 | -0/+4 |
|/ / / / / | | | | | | | | | | | | | | | | Bug 1426030 | ||||
* | | | | | Merge pull request #3471 from giuseppe/run_disable_excluder_on_config | Giuseppe Scrivano | 2017-02-24 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | initialize_openshift_version: handle excluder packages | ||||
| * | | | | | initialize_openshift_version: handle excluder packages | Giuseppe Scrivano | 2017-02-23 | 1 | -0/+4 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1423447 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | | Merge pull request #3406 from sdodson/openshift_repos | Scott Dodson | 2017-02-23 | 5 | -43/+76 |
|\ \ \ \ \ | | | | | | | | | | | | | Install repos on containerized hosts for python dependencies | ||||
| * | | | | | add dependency on openshift_repos | Scott Dodson | 2017-02-17 | 2 | -0/+30 |
| | | | | | | |||||
| * | | | | | Add centos paas sig common | Scott Dodson | 2017-02-17 | 1 | -0/+7 |
| | | | | | | |||||
| * | | | | | Disentangle openshift_repos from openshift_facts | Scott Dodson | 2017-02-17 | 2 | -43/+39 |
| | | | | | | |||||
* | | | | | | Merge pull request #3474 from sdodson/image-stream-sync | Scott Dodson | 2017-02-23 | 51 | -60/+852 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Image stream sync | ||||
| * | | | | | | Update v1.5 content | Scott Dodson | 2017-02-23 | 22 | -28/+122 |
| | | | | | | | |||||
| * | | | | | | Update v1.4 content | Scott Dodson | 2017-02-23 | 23 | -29/+123 |
| | | | | | | | |||||
| * | | | | | | xPaaS ose-v1.3.6 | Scott Dodson | 2017-02-23 | 6 | -3/+607 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Use 2 and 3 friendly urlparse in oo_filters | Steve Milner | 2017-02-23 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3470 from wshearn/logging_insecureedgeterminationpolicy | Jeff Cantrill | 2017-02-23 | 4 | -0/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add insecure edge termination policy for kibana. | ||||
| * | | | | | Add insecure edge termination policy for kibana. | Wesley Hearn | 2017-02-23 | 4 | -0/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #3462 from richm/put-curator-config-in-etc | Scott Dodson | 2017-02-23 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | curator config must be in /etc/curator not /usr/curator | ||||
| * | | | | | curator config must be in /etc/curator not /usr/curator | Rich Megginson | 2017-02-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3465 from mtnbikenc/task-wait | Russell Teague | 2017-02-23 | 3 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | BZ 1425688: Convert selectattr tests to use 'match' | ||||
| * | | | | | | Convert selectattr tests to use 'match' | Russell Teague | 2017-02-23 | 3 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3466 from kwoodson/doc_fix_ca_server_cert | Scott Dodson | 2017-02-23 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Doc fix for oc_adm_ca_server_cert. | ||||
| * | | | | | | Fixing doc for oc_adm_ca_server_cert. | Kenny Woodson | 2017-02-23 | 2 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3464 from sdodson/fix-generated-code | Scott Dodson | 2017-02-23 | 1 | -5/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Re-generate lib_openshift and lib_utils libraries | ||||
| * | | | | | | Re-generate lib_openshift and lib_utils libraries | Scott Dodson | 2017-02-23 | 1 | -5/+34 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3416 from detiber/combinedTest | Scott Dodson | 2017-02-23 | 27 | -100/+1808 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | lib_openshift - handle cases where oc binary is not in path | ||||
| * | | | | | | lib_openshift oc file lookup improvements | Jason DeTiberus | 2017-02-21 | 28 | -226/+1766 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move binary file search to separate method called from constructor - Use six.PY3 instaed of sys.version_info - Combine additional paths with the paths from the environment - For py3 pass the combined paths to shutil.which - For py2 explictly search for existance of file from combined paths instead of using distutils.spawn.find_executable and falling back - Use 'oc adm' instead of 'oadm' - Fix generate_validation test issue - fix tests for oc binary location - add tests for file lookup | ||||
| * | | | | | | roles/lib_openshift: Handle /usr/local/bin/oc with sudo | Colin Walters | 2017-02-21 | 15 | -56/+224 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The real changes here are in `src/lib/{base,import}.py` remember, the rest is committed to git rather than built for some reason. This is tested on CentOS AH (python2), I haven't yet tested the Python 3 path here. I tried the suggestion in the PR for using Ansible's `module` but AFAICS that would require passing down the `module` variable pretty far down into this code. This implementation seems OK too. Closes: https://github.com/openshift/openshift-ansible/issues/3410 | ||||
* | | | | | | Merge pull request #3460 from kwoodson/handle_router_prep | Russell Teague | 2017-02-23 | 2 | -14/+40 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Handle router preparation errors. Also added a second sleep timer for creating openshift objects. |