summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | |
| * | Attempt to handle router preparation errors.Kenny Woodson2017-02-222-6/+16
|/ /
* | Merge pull request #3458 from kwoodson/generate_tox_fixKenny Woodson2017-02-221-33/+56
|\ \ | | | | | | Fixing tox test.
| * | Fixing the generate tox tests.Kenny Woodson2017-02-221-33/+56
|/ /
* | Merge pull request #3378 from kwoodson/oadm_caKenny Woodson2017-02-225-0/+1768
|\ \ | | | | | | Adding oc_adm_ca_server_cert to lib_openshift
| * | Moving import to local class.Kenny Woodson2017-02-2216-30/+2
| | |
| * | Removing reference to oadm. Moved parameter under general params.Kenny Woodson2017-02-222-4/+4
| | |
| * | Added backup feature. Fixed a bug with reading the certificate and ↵Kenny Woodson2017-02-2118-24/+90
| | | | | | | | | | | | verifying names. Added force option.
| * | Added copy support when modifying cert and key on existenceKenny Woodson2017-02-214-2/+38
| | |
| * | Small spacing fix.Kenny Woodson2017-02-212-0/+3
| | |
| * | Updated doc and defined defaults for signer_*Kenny Woodson2017-02-214-23/+19
| | |
| * | Removing cmd, fixed docs and comments.Kenny Woodson2017-02-203-149/+82
| | |
| * | Rename of oadm_ca to oc_adm_ca. Decided to whittle down to the direct call, ↵Kenny Woodson2017-02-205-96/+60
| | | | | | | | | | | | server_cert.
| * | Fixing doc.Kenny Woodson2017-02-203-86/+174
| | |
| * | Adding oadm_ca to lib_openshift.Kenny Woodson2017-02-205-0/+1710
| | |
* | | Merge pull request #3429 from ashcrow/remove-no-memberScott Dodson2017-02-2229-589/+961
|\ \ \ | | | | | | | | Removed unrequired no-members
| * | | fix up ruamel.yaml/pyyaml no-member lint errorsJason DeTiberus2017-02-2221-552/+632
| | | |
| * | | Renamed NotContainerized to NotContainerizedMixin and dropped no-memberSteve Milner2017-02-225-12/+10
| | | |
| * | | Removed unrequired no-members from yedit and generated codeSteve Milner2017-02-2218-146/+440
| | |/ | |/|
* | | Merge pull request #3447 from kwoodson/router_no_default_certKenny Woodson2017-02-225-12/+38
|\ \ \ | | | | | | | | Fix for no default_cert or cert, key, cacert files
| * | | Added required_together. Added two minor bug fixes for when data is not passed.Kenny Woodson2017-02-225-12/+20
| | | |
| * | | if no key, cert, cacert, or default_cert is passed then do not pass to ocKenny Woodson2017-02-213-4/+22
| |/ /
* | | Merge pull request #3454 from ewolinetz/logging_tag_master_configScott Dodson2017-02-221-0/+2
|\ \ \ | | | | | | | | adding tag to update_master_config
| * | | adding tag to update_master_configewolinetz2017-02-221-0/+2
| |/ /
* / / CloudFront oc_secret contents should be a listSteve Milner2017-02-221-2/+2
|/ / | | | | | | | | Fixes "argument contents is of type <type 'dict'> and we were unable to convert to list"
* | Merge pull request #3438 from jcantrill/bz_1425321_default_api_portScott Dodson2017-02-212-2/+2
|\ \ | | | | | | Bz 1425321 default api port
| * | bug 1425321. Default the master api port based on the factsJeff Cantrill2017-02-212-2/+2
| | |
* | | Merge pull request #3444 from richm/bug-1420219Scott Dodson2017-02-211-0/+5
|\ \ \ | | | | | | | | Bug 1420219 - No log entry can be found in Kibana UI after deploying logging stacks with ansible
| * | | Bug 1420219 - No log entry can be found in Kibana UI after deploying logging ↵Rich Megginson2017-02-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | stacks with ansible https://bugzilla.redhat.com/show_bug.cgi?id=1420219 The elasticsearch config was missing the common data model stanza
* | | | Merge pull request #3436 from tbielawa/hacky_cert_parsingTim Bielawa2017-02-216-18/+486
|\ \ \ \ | |/ / / |/| | | Implement fake openssl cert classes
| * | | Address cert expiry parsing review commentsTim Bielawa2017-02-212-8/+7
| | | |
| * | | Implement fake openssl cert classesTim Bielawa2017-02-216-16/+485
| | | |
* | | | Merge pull request #3377 from kwoodson/router_registryRussell Teague2017-02-2134-11/+7229
|\ \ \ \ | | | | | | | | | | Adding oc_adm_router and oc_adm_registry to lib_openshift
| * | | | Removed oadm_ references in doc.Kenny Woodson2017-02-214-4/+4
| | | | |
| * | | | Removed unused code. Made tests executable.Kenny Woodson2017-02-2115-50/+12
| | | | |
| * | | | Fixing docs. Fixed default_cert suggestion.Kenny Woodson2017-02-2011-72/+173
| | | | |
| * | | | Renamed modules, fixed docs, renamed variables, and cleaned up logic.Kenny Woodson2017-02-2018-262/+340
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 08:42:00 +0000