summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4071 from ewolinetz/cherry_pick_htpasswdOpenShift Bot2017-05-041-7/+9
|\ | | | | Merged by openshift-bot
| * Modified pick from release-1.5 for updating hawkular htpasswd generationewolinetz2017-05-021-7/+9
| |
* | Merge pull request #4085 from ewolinetz/pick_issue4083OpenShift Bot2017-05-035-14/+2
|\ \ | | | | | | Merged by openshift-bot
| * | Correctly setting the primary and replica shard count settingsewolinetz2017-05-035-14/+2
| | |
* | | Merge pull request #4049 from ashcrow/system-container-dockerOpenShift Bot2017-05-0315-122/+370
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | System container dockerSteve Milner2017-05-0315-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-logOpenShift Bot2017-05-031-0/+1
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Stop logging AWS credentials in master role.Devan Goodwin2017-05-031-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/atomicf25OpenShift Bot2017-05-032-7/+9
|\ \ \ | |/ / |/| | Merged by openshift-bot
| * | Remove set operations from openshift_master_certificates iteration.Andrew Butcher2017-05-021-4/+4
| | |
| * | Refactor system fact gathering to avoid dictionary size change during iteration.Andrew Butcher2017-05-021-3/+5
| | |
* | | Merge pull request #4070 from ewolinetz/mux_scaleup_fixOpenShift Bot2017-05-022-2/+2
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Making mux with_items list evaluate as empty if didnt get objects beforeewolinetz2017-05-022-2/+2
| | |/ | |/|
* | | Merge pull request #4059 from sdodson/master-1.5-caOpenShift Bot2017-05-021-1/+1
|\ \ \ | |/ / |/| | Merged by openshift-bot
| * | Use openshift_ca_host's hostnames to sign the CAScott Dodson2017-05-011-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_labelsOpenShift Bot2017-05-022-11/+34
|\ \ | | | | | | Merged by openshift-bot
| * | Adding way to add labels and nodeselectors to logging projectewolinetz2017-04-272-11/+34
| | |
* | | Merge pull request #4034 from ↵Jan Chaloupka2017-05-022-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 roleJan Chaloupka2017-04-282-0/+44
| | | |
* | | | Merge pull request #3975 from sdodson/ansible_23_warningsOpenShift Bot2017-05-0130-50/+50
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Don't double quote when conditionsScott Dodson2017-05-0129-49/+49
| | | | |
| * | | | Remove jinja template delimeters from when conditionsScott Dodson2017-05-0113-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.0OpenShift Bot2017-05-012-3/+4
|\ \ \ \ | |/ / / |/| | | Merged by openshift-bot
| * | | Fix test compatibility with OpenSSL 1.1.0Pierre-Louis Bonicoli2017-04-282-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-roleJan Chaloupka2017-04-3010-78/+75
|\ \ \ \ | | | | | | | | | | Refactor etcd roles
| * | | | Refactor etcd rolesJan Chaloupka2017-04-2810-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.2OpenShift Bot2017-04-283-33/+51
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fix OpenShift registry deployment on OSE 3.2Lénaïc Huard2017-04-253-33/+51
| | |/ / | |/| | | | | | | | | | Fix #4000
* | | | Merge pull request #4018 from ewolinetz/issue4007OpenShift Bot2017-04-281-1/+4
|\ \ \ \ | |_|_|/ |/| | | Merged by openshift-bot
| * | | Adding checks for starting mux for 2.2.0ewolinetz2017-04-261-1/+4
| | |/ | |/|
* / | Add bool for proper conditional handlingRussell Teague2017-04-262-2/+2
|/ /
* | Merge pull request #3950 from lhuard1A/enterprise_ose_3.5OpenShift Bot2017-04-261-3/+6
|\ \ | | | | | | Merged by openshift-bot
| * | Make the rhel_subscribe role subscribe to OSE 3.5 channel by defaultLénaïc Huard2017-04-191-3/+6
| | |
* | | Merge pull request #3970 from mtnbikenc/3_6-upgradeOpenShift Bot2017-04-25136-17/+20
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Standardize all Origin versioning on 3.6Russell Teague2017-04-25136-17/+20
| | | |
* | | | Merge pull request #3988 from abutcher/router-cert-varsOpenShift Bot2017-04-252-10/+10
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Replace original router cert variable names.Andrew Butcher2017-04-242-10/+10
| | |/ / | |/| |
* | | | Merge pull request #3968 from jarrpa/oc_obj-kindsOpenShift Bot2017-04-253-14/+8
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | oc_obj: Allow for multiple kinds in deleteJose A. Rivera2017-04-213-14/+8
| | |/ | |/| | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | Merge pull request #3962 from sdodson/image-stream-syncOpenShift Bot2017-04-256-8/+50
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Update v1.5 contentScott Dodson2017-04-203-4/+25
| | | |
| * | | Update v1.6 contentScott Dodson2017-04-203-4/+25
| | |/ | |/|
* | | Merge pull request #3911 from ewolinetz/logging_15_picksOpenShift Bot2017-04-255-159/+202
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Addressing yamllintewolinetz2017-04-131-4/+4
| | | |
| * | | Updating kibana-proxy secret key for server-tls entryewolinetz2017-04-131-1/+1
| | | |
| * | | Pick from issue3896ewolinetz2017-04-134-154/+197
| | | |
* | | | Revert "Add /etc/sysconfig/etcd to etcd_container"Scott Dodson2017-04-251-1/+1
| | | |
* | | | Merge pull request #3976 from mtnbikenc/swap-updateOpenShift Bot2017-04-252-16/+26
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Update swap disable tasksRussell Teague2017-04-212-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Lines are commented out vice being removed * Comment is added indicating why the change happened * Variable openshift_disable_swap added to allow user control
* | | | | Merge pull request #3932 from richm/muxOpenShift Bot2017-04-2414-0/+413
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot