summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* install the latest excludersJan Chaloupka2017-02-271-0/+2
|
* Merge pull request #3358 from jpkrohling/JPK-JGroups-ASYM-PasswordScott Dodson2017-02-274-43/+12
|\ | | | | Removed JGroups cert and password generation.
| * Removed JGroups cert and password generation.Juraci Paixão Kröhling2017-02-244-43/+12
| |
* | Merge pull request #3468 from jcantrill/logging_expand_replicasScott Dodson2017-02-271-1/+1
|\ \ | | | | | | openshift_logging default to 2 replicas of primary shards
| * | openshift_logging default to 2 replicas of primary shardsJeff Cantrill2017-02-231-1/+1
| | |
* | | Merge pull request #3448 from smarterclayton/versionScott Dodson2017-02-245-20/+22
|\ \ \ | | | | | | | | Prepare for origin moving to OCP version scheme
| * | | Prepare for origin moving to OCP version schemeClayton Coleman2017-02-235-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-hostedScott Dodson2017-02-249-414/+274
|\ \ \ \ | | | | | | | | | | [openshift_hosted] Router/Registry
| * | | | openshift_hosted: Update tasks to use oc_ modulesRussell Teague2017-02-249-414/+274
|/ / / /
* | | | Merge pull request #3467 from kwoodson/registry_updatesKenny Woodson2017-02-247-4/+80
|\ \ \ \ | | | | | | | | | | Fixed default variables. Added a fix to generated secret in env var.
| * | | | Rebased.Kenny Woodson2017-02-244-4/+4
| | | | |
| * | | | Fixed indentationKenny Woodson2017-02-241-1/+1
| | | | |
| * | | | Adding get_env_var to deploymentconfig.Kenny Woodson2017-02-246-66/+68
| | | | |
| * | | | Fixed default variables. Added a fix to generated secret in env var.Kenny Woodson2017-02-247-4/+78
| | | | |
* | | | | Merge pull request #3486 from tbielawa/bz1421053Andrew Butcher2017-02-241-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | Fix Quick Installer failed due to a Python method failure
| * | | | Fix Quick Installer failed due to a Python method failureTim Bielawa2017-02-241-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-commonScott Dodson2017-02-241-7/+0
|\ \ \ \ \ | |/ / / / |/| | | | Revert "Add centos paas sig common"
| * | | | Revert "Add centos paas sig common"Scott Dodson2017-02-241-7/+0
|/ / / / | | | | | | | | | | | | This reverts commit 7a16f20b936546f47df87662c78f7fe12e75fe85.
* | | | Merge pull request #3457 from sdodson/1414276Scott Dodson2017-02-242-2/+2
|\ \ \ \ | |_|_|/ |/| | | BZ1414276 - Quote ansible_ssh_user when determining group id
| * | | BZ1414276 - Quote ansible_ssh_user when determining group idScott Dodson2017-02-222-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_secretScott Dodson2017-02-241-2/+2
|\ \ \ \ | | | | | | | | | | bug 1417261. Quote name and secrets in logging templates
| * | | | bug 1417261. Quote name and secrets in logging templatesJeff Cantrill2017-02-201-2/+2
| | | | |
* | | | | Merge pull request #3483 from ingvagabund/fix-symlink-to-lookups-in-spec-fileScott Dodson2017-02-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix symlink to lookup_plugins/oo_option.py
| * | | | | Fix symlink to lookup_plugins/oo_option.pyJan Chaloupka2017-02-241-0/+4
|/ / / / / | | | | | | | | | | | | | | | Bug 1426030
* | | | | Merge pull request #3471 from giuseppe/run_disable_excluder_on_configGiuseppe Scrivano2017-02-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | initialize_openshift_version: handle excluder packages
| * | | | | initialize_openshift_version: handle excluder packagesGiuseppe Scrivano2017-02-231-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_reposScott Dodson2017-02-235-43/+76
|\ \ \ \ \ | | | | | | | | | | | | Install repos on containerized hosts for python dependencies
| * | | | | add dependency on openshift_reposScott Dodson2017-02-172-0/+30
| | | | | |
| * | | | | Add centos paas sig commonScott Dodson2017-02-171-0/+7
| | | | | |
| * | | | | Disentangle openshift_repos from openshift_factsScott Dodson2017-02-172-43/+39
| | | | | |
* | | | | | Merge pull request #3474 from sdodson/image-stream-syncScott Dodson2017-02-2351-60/+852
|\ \ \ \ \ \ | | | | | | | | | | | | | | Image stream sync
| * | | | | | Update v1.5 contentScott Dodson2017-02-2322-28/+122
| | | | | | |
| * | | | | | Update v1.4 contentScott Dodson2017-02-2323-29/+123
| | | | | | |
| * | | | | | xPaaS ose-v1.3.6Scott Dodson2017-02-236-3/+607
| | |/ / / / | |/| | | |
* | | | | | Use 2 and 3 friendly urlparse in oo_filtersSteve Milner2017-02-231-1/+1
| | | | | |
* | | | | | Merge pull request #3470 from wshearn/logging_insecureedgeterminationpolicyJeff Cantrill2017-02-234-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add insecure edge termination policy for kibana.
| * | | | | Add insecure edge termination policy for kibana.Wesley Hearn2017-02-234-0/+6
|/ / / / /
* | | | | Merge pull request #3462 from richm/put-curator-config-in-etcScott Dodson2017-02-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | curator config must be in /etc/curator not /usr/curator
| * | | | | curator config must be in /etc/curator not /usr/curatorRich Megginson2017-02-221-1/+1
| | | | | |
* | | | | | Merge pull request #3465 from mtnbikenc/task-waitRussell Teague2017-02-233-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | BZ 1425688: Convert selectattr tests to use 'match'
| * | | | | | Convert selectattr tests to use 'match'Russell Teague2017-02-233-3/+3
| | | | | | |
* | | | | | | Merge pull request #3466 from kwoodson/doc_fix_ca_server_certScott Dodson2017-02-232-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Doc fix for oc_adm_ca_server_cert.
| * | | | | | Fixing doc for oc_adm_ca_server_cert.Kenny Woodson2017-02-232-4/+4
|/ / / / / /
* | | | | | Merge pull request #3464 from sdodson/fix-generated-codeScott Dodson2017-02-231-5/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | Re-generate lib_openshift and lib_utils libraries
| * | | | | | Re-generate lib_openshift and lib_utils librariesScott Dodson2017-02-231-5/+34
|/ / / / / /
* | | | | | Merge pull request #3416 from detiber/combinedTestScott Dodson2017-02-2327-100/+1808
|\ \ \ \ \ \ | | | | | | | | | | | | | | lib_openshift - handle cases where oc binary is not in path
| * | | | | | lib_openshift oc file lookup improvementsJason DeTiberus2017-02-2128-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 sudoColin Walters2017-02-2115-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_prepRussell Teague2017-02-232-14/+40
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Handle router preparation errors. Also added a second sleep timer for creating openshift objects.
| * | | | | Updated for pylint. Fixed create doc.Kenny Woodson2017-02-222-8/+24
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:23:46 +0000