Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix additional master cert & client config creation. | Andrew Butcher | 2017-05-08 | 1 | -2/+2 |
| | |||||
* | Merge pull request #4103 from ganhuang/fix_container_engine | OpenShift Bot | 2017-05-05 | 6 | -24/+27 |
|\ | | | | | Merged by openshift-bot | ||||
| * | Fix 1448368, and some other minors issues | Gan Huang | 2017-05-05 | 6 | -24/+27 |
| | | |||||
* | | Merge pull request #4093 from richm/mux-result-startup-fix | Scott Dodson | 2017-05-05 | 2 | -2/+2 |
|\ \ | |/ |/| | mux startup is broken without this fix | ||||
| * | mux startup is broken without this fix | Rich Megginson | 2017-05-04 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-common | Jan Chaloupka | 2017-05-04 | 3 | -1/+3 |
|\ \ | | | | | | | move etcdctl.yml from etcd to etcd_common role | ||||
| * | | move etcdctl.yml from etcd to etcd_common role | Jan Chaloupka | 2017-05-03 | 3 | -1/+3 |
| | | | |||||
* | | | Merge pull request #4044 from mtnbikenc/clean-cache | OpenShift Bot | 2017-05-04 | 1 | -0/+17 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Ensure repo cache is clean on the first run | Russell Teague | 2017-05-03 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | The openshift_repos role is modified to clean the repo cache on first run to ensure a clean cache in the situation where the repo files have been changed manually, such as just prior to upgrades. | ||||
* | | | | Merge pull request #4089 from mtnbikenc/unicode-decode | OpenShift Bot | 2017-05-04 | 28 | -28/+28 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Allow oc_ modules to pass unicode results | Russell Teague | 2017-05-03 | 28 | -28/+28 |
| | | | | | |||||
* | | | | | Merge pull request #4071 from ewolinetz/cherry_pick_htpasswd | OpenShift Bot | 2017-05-04 | 1 | -7/+9 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Merged by openshift-bot | ||||
| * | | | | Modified pick from release-1.5 for updating hawkular htpasswd generation | ewolinetz | 2017-05-02 | 1 | -7/+9 |
| | | | | | |||||
* | | | | | Merge pull request #4085 from ewolinetz/pick_issue4083 | OpenShift Bot | 2017-05-03 | 5 | -14/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Correctly setting the primary and replica shard count settings | ewolinetz | 2017-05-03 | 5 | -14/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4049 from ashcrow/system-container-docker | OpenShift Bot | 2017-05-03 | 15 | -122/+370 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| * | | | | System container docker | Steve Milner | 2017-05-03 | 15 | -122/+370 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows for the use of either the traditional package install of docker OR a system container install of docker. Two new inventory options, openshift_docker_use_system_container and openshift_docker_systemcontainer_image_registry_override, have been added which are be used to install with a system container. By default this option is commented out. One new fact has been added: - docker.service_name: docker by default, container-engine-docker for system container | ||||
* | | | | Merge pull request #4080 from dgoodwin/aws-cred-no-log | OpenShift Bot | 2017-05-03 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Stop logging AWS credentials in master role. | Devan Goodwin | 2017-05-03 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Using lineinfile and with_items, the items end up logged and in this case include AWS credentials. Simple us of no_log to hide them. | ||||
* | | | | Merge pull request #4062 from abutcher/atomicf25 | OpenShift Bot | 2017-05-03 | 2 | -7/+9 |
|\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| * | | | Remove set operations from openshift_master_certificates iteration. | Andrew Butcher | 2017-05-02 | 1 | -4/+4 |
| | | | | |||||
| * | | | Refactor system fact gathering to avoid dictionary size change during iteration. | Andrew Butcher | 2017-05-02 | 1 | -3/+5 |
| | | | | |||||
* | | | | Merge pull request #4070 from ewolinetz/mux_scaleup_fix | OpenShift Bot | 2017-05-02 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Making mux with_items list evaluate as empty if didnt get objects before | ewolinetz | 2017-05-02 | 2 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #4059 from sdodson/master-1.5-ca | OpenShift Bot | 2017-05-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| * | | | Use openshift_ca_host's hostnames to sign the CA | Scott Dodson | 2017-05-01 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | If for some reason oo_first_master and openshift_ca_host are different we could've signed the CA with the wrong hostnames. | ||||
* | | | Merge pull request #4028 from ewolinetz/logging_project_ns_labels | OpenShift Bot | 2017-05-02 | 2 | -11/+34 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Adding way to add labels and nodeselectors to logging project | ewolinetz | 2017-04-27 | 2 | -11/+34 |
| | | | | |||||
* | | | | Merge pull request #4034 from ↵ | Jan Chaloupka | 2017-05-02 | 2 | -0/+44 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | ingvagabund/move-excluder-verification-code-under-excluders-role [RFE] move excluder upgrade validation tasks under openshift_excluder role | ||||
| * | | | | move excluder upgrade validation tasks under openshift_excluder role | Jan Chaloupka | 2017-04-28 | 2 | -0/+44 |
| | | | | | |||||
* | | | | | Merge pull request #3975 from sdodson/ansible_23_warnings | OpenShift Bot | 2017-05-01 | 30 | -50/+50 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Don't double quote when conditions | Scott Dodson | 2017-05-01 | 29 | -49/+49 |
| | | | | | | |||||
| * | | | | | Remove jinja template delimeters from when conditions | Scott Dodson | 2017-05-01 | 13 | -22/+22 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | In ansible 2.3 "[WARNING]: when statements should not include jinja2 templating delimiters such as {{ }} or {% %}. Found: {{ g_glusterfs_hosts is not defined }}" | ||||
* | | | | | Merge pull request #3865 from pilou-/fix_test_openssl_1.1.0 | OpenShift Bot | 2017-05-01 | 2 | -3/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Merged by openshift-bot | ||||
| * | | | | Fix test compatibility with OpenSSL 1.1.0 | Pierre-Louis Bonicoli | 2017-04-28 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since OpenSSL 1.1.0, default name options ('oneline') for 'x509' command include 'space_eq'. Explicitly enable 'oneline' in order to have one behaviour with all versions. | ||||
* | | | | | Merge pull request #3817 from ingvagabund/polish-etcd-role | Jan Chaloupka | 2017-04-30 | 10 | -78/+75 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Refactor etcd roles | ||||
| * | | | | Refactor etcd roles | Jan Chaloupka | 2017-04-28 | 10 | -78/+75 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce block and simplify when conditions - introduce config.yml so the self-standing etcd role can be run (e.g. to test etcd cluster deployment) - remove empty task files - skip dependency on openshift_etcd_ca - replace cert paths with their appropriate variables | ||||
* | | | | Merge pull request #4003 from lhuard1A/fix_registry_ose_3.2 | OpenShift Bot | 2017-04-28 | 3 | -33/+51 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Fix OpenShift registry deployment on OSE 3.2 | Lénaïc Huard | 2017-04-25 | 3 | -33/+51 |
| | |/ / | |/| | | | | | | | | | | Fix #4000 | ||||
* | | | | Merge pull request #4018 from ewolinetz/issue4007 | OpenShift Bot | 2017-04-28 | 1 | -1/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Merged by openshift-bot | ||||
| * | | | Adding checks for starting mux for 2.2.0 | ewolinetz | 2017-04-26 | 1 | -1/+4 |
| | |/ | |/| | |||||
* / | | Add bool for proper conditional handling | Russell Teague | 2017-04-26 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #3950 from lhuard1A/enterprise_ose_3.5 | OpenShift Bot | 2017-04-26 | 1 | -3/+6 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | Make the rhel_subscribe role subscribe to OSE 3.5 channel by default | Lénaïc Huard | 2017-04-19 | 1 | -3/+6 |
| | | | |||||
* | | | Merge pull request #3970 from mtnbikenc/3_6-upgrade | OpenShift Bot | 2017-04-25 | 136 | -17/+20 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Standardize all Origin versioning on 3.6 | Russell Teague | 2017-04-25 | 136 | -17/+20 |
| | | | | |||||
* | | | | Merge pull request #3988 from abutcher/router-cert-vars | OpenShift Bot | 2017-04-25 | 2 | -10/+10 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Replace original router cert variable names. | Andrew Butcher | 2017-04-24 | 2 | -10/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3968 from jarrpa/oc_obj-kinds | OpenShift Bot | 2017-04-25 | 3 | -14/+8 |
|\ \ \ \ | |_|/ / |/| | | | Merged by openshift-bot | ||||
| * | | | oc_obj: Allow for multiple kinds in delete | Jose A. Rivera | 2017-04-21 | 3 | -14/+8 |
| | |/ | |/| | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> |