Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4109 from ewolinetz/fix_ocobj_absent | OpenShift Bot | 2017-05-10 | 2 | -2/+2 |
|\ | | | | | Merged by openshift-bot | ||||
| * | Updating oc_obj to use get instead of getattr | ewolinetz | 2017-05-08 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #4124 from ingvagabund/update-etcd-common-readme | OpenShift Bot | 2017-05-10 | 1 | -9/+28 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | polish etcd_common role | Jan Chaloupka | 2017-05-09 | 1 | -9/+28 |
| | | | |||||
* | | | Merge pull request #3969 from jarrpa/glusterfs-registry-too | OpenShift Bot | 2017-05-10 | 15 | -225/+380 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | GlusterFS: Allow swapping an existing registry's backend storage | Jose A. Rivera | 2017-05-04 | 6 | -3/+53 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | GlusterFS: Allow for a separate registry-specific playbook | Jose A. Rivera | 2017-05-04 | 11 | -220/+308 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | GlusterFS: Improve role documentation | Jose A. Rivera | 2017-05-04 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | hosted_registry: Get correct pod selector for GlusterFS storage | Jose A. Rivera | 2017-05-04 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | hosted registry: Fix typo | Jose A. Rivera | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | Merge pull request #4033 from ↵ | Jan Chaloupka | 2017-05-10 | 3 | -40/+58 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | ingvagabund/report-docker-image-version-and-excluder-rpm-version [RFE] report and fail if rpm version differs from docker image version | ||||
| * | | | | Fail if rpm version != docker image version | Jan Chaloupka | 2017-05-09 | 3 | -40/+58 |
| | | | | | |||||
* | | | | | Merge pull request #4116 from abutcher/bz1448824 | Jan Chaloupka | 2017-05-10 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix additional master cert & client config creation | ||||
| * | | | | | Fix additional master cert & client config creation. | Andrew Butcher | 2017-05-08 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4123 from rhcarvalho/remove-vim-line | Rodolfo Carvalho | 2017-05-10 | 9 | -10/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove vim configuration from Python files | ||||
| * | | | | | Remove vim configuration from Python files | Rodolfo Carvalho | 2017-05-09 | 9 | -10/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a project where contributors are free to use whatever editor they want and we have linting tools that verify the proper formatting of Python files, it should not be required to have a vim-specific line in Python files. | ||||
* | | | | | | Merge pull request #4106 from ashcrow/1448384 | OpenShift Bot | 2017-05-09 | 2 | -6/+14 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Merged by openshift-bot | ||||
| * | | | | | Use local variables for daemon.json template | Steve Milner | 2017-05-08 | 2 | -6/+14 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using bare lists and dicts this change converts variables into json for use with daemon.json. jinja2 does have an ability to do this in side of templates, however it is only available in 2.9+. Until then the use of ansible's to_json in the playbook is being used. Refs: - http://jinja.pocoo.org/docs/2.9/templates/#tojson - http://docs.ansible.com/ansible/playbooks_filters.html#filters-for-formatting-data | ||||
* | | | | | Merge pull request #4026 from ewolinetz/cherry_picks_15 | OpenShift Bot | 2017-05-08 | 7 | -13/+51 |
|\ \ \ \ \ | |/ / / / |/| | | | | Merged by openshift-bot | ||||
| * | | | | Updating logging and metrics to restart api, ha and controllers when ↵ | ewolinetz | 2017-04-28 | 5 | -6/+30 |
| | | | | | | | | | | | | | | | | | | | | updating master config | ||||
| * | | | | Adding defaults for es_indices | ewolinetz | 2017-04-27 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Updating logic for generating pvcs and their counts to prevent reuse when ↵ | ewolinetz | 2017-04-27 | 2 | -7/+21 |
| | | | | | | | | | | | | | | | | | | | | looping | ||||
* | | | | | 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 |