summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-commonJan Chaloupka2017-05-044-2/+6
|\ | | | | move etcdctl.yml from etcd to etcd_common role
| * move etcdctl.yml from etcd to etcd_common roleJan Chaloupka2017-05-034-2/+6
| |
* | Merge pull request #4044 from mtnbikenc/clean-cacheOpenShift Bot2017-05-042-11/+17
|\ \ | | | | | | Merged by openshift-bot
| * | Ensure repo cache is clean on the first runRussell Teague2017-05-032-11/+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-decodeOpenShift Bot2017-05-0428-28/+28
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Allow oc_ modules to pass unicode resultsRussell Teague2017-05-0328-28/+28
| | | |
* | | | Merge pull request #4071 from ewolinetz/cherry_pick_htpasswdOpenShift Bot2017-05-042-11/+14
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Modified pick from release-1.5 for updating hawkular htpasswd generationewolinetz2017-05-022-11/+14
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.6.53-1].Jenkins CD Merge Bot2017-05-042-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | 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-0317-122/+394
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Merged by openshift-bot
| * | | | | System container dockerSteve Milner2017-05-0317-122/+394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-033-9/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | 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
| | | | | |
| * | | | | Refactor secret generation for python3.Andrew Butcher2017-05-021-2/+2
| | | | | |
* | | | | | Merge pull request #4011 from jlebon/pr/rhci-fixesOpenShift Bot2017-05-032-4/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Merged by openshift-bot
| * | | | | redhat-ci: use requirements.txtJonathan Lebon2017-04-262-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use requirements.txt rather than hardcoding the ansible version here. Also update the comment re. `rpm-ostree status`.
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.52-1].Jenkins CD Merge Bot2017-05-032-2/+14
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | 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 #4068 from mtnbikenc/fix-variantsScott Dodson2017-05-021-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix variants for v3.6
| * | | | | Fix variants for v3.6Russell Teague2017-05-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1447204
* | | | | | Merge pull request #4038 from mtnbikenc/upgrade-refactorOpenShift Bot2017-05-0233-1294/+1384
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | etcd Upgrade RefactorRussell Teague2017-05-025-80/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Renaming etcd_hosts_to_* to oo_etcd_hosts_to* * Moving host group evaluation to evaluate_groups.yml * Removing duplicate evaluate_groups.yml usage
| * | | | | | v3.3 Upgrade RefactorRussell Teague2017-05-027-301/+327
| | | | | | |
| * | | | | | v3.4 Upgrade RefactorRussell Teague2017-05-027-297/+323
| | | | | | |
| * | | | | | v3.5 Upgrade RefactorRussell Teague2017-05-027-308/+333
| | | | | | |
| * | | | | | v3.6 Upgrade RefactorRussell Teague2017-05-027-308/+333
| |/ / / / /
* | | | | | 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 #4045 from kwoodson/normalize_groupsOpenShift Bot2017-05-027-20/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Normalizing groups.Kenny Woodson2017-05-017-20/+9
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.51-1].Jenkins CD Merge Bot2017-05-022-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Merge pull request #4053 from abutcher/rhsub-sans-std-includeOpenShift Bot2017-05-021-4/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Merged by openshift-bot
| * | | | | | Remove std_include from playbooks/byo/rhel_subscribe.ymlAndrew Butcher2017-05-011-4/+0
| | | | | | |
* | | | | | | 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
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.50-1].Jenkins CD Merge Bot2017-05-022-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Merge pull request #4034 from ↵Jan Chaloupka2017-05-023-10/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-10/+20
| | | | | | | |
* | | | | | | | Merge pull request #3975 from sdodson/ansible_23_warningsOpenShift Bot2017-05-0143-83/+83
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Don't double quote when conditionsScott Dodson2017-05-0140-80/+80
| | | | | | | | |
| * | | | | | | | Remove jinja template delimeters from when conditionsScott Dodson2017-05-0123-51/+51
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.49-1].Jenkins CD Merge Bot2017-05-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog