summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5932 from mgugino-upstream-stage/retry-docker-credsOpenShift Merge Robot2017-10-314-0/+13
|\ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add retry logic to docker auth credentials This commit enables retry on docker login commands. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506931
| * Add retry logic to docker auth credentialsMichael Gugino2017-10-304-0/+13
| | | | | | | | | | | | This commit enables retry on docker login commands. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506931
* | Merge pull request #2910 from richm/preserve-ansible_inventory_pathOpenShift Merge Robot2017-10-311-2/+4
|\ \ | | | | | | | | | | | | Automatic merge from submit-queue. preserve the oo-install ansible_inventory_path value
| * | preserve the oo-install ansible_inventory_path valueRich Megginson2017-05-181-2/+4
| | |
* | | Merge pull request #5930 from mgugino-upstream-stage/retry-journald-restartScott Dodson2017-10-311-3/+5
|\ \ \ | | | | | | | | Retry restarting journald
| * | | Retry restarting journaldMichael Gugino2017-10-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes journald fails to restart cleanly during upgrades. This commit retries restarting 3 times. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506141
* | | | Merge pull request #5919 from pecameron/cache-sizeOpenShift Merge Robot2017-10-312-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. dnsmasq cache-size dns-forward-max change On very large clusters dnsmasq performance suffers due to limited cache-size and dns-forward-max values. bug: 1482847 https://bugzilla.redhat.com/show_bug.cgi?id=1482847
| * | | | dnsmasq cache-size dns-forward-max changePhil Cameron2017-10-302-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On very large clusters dnsmasq performance suffers due to limited cache-size and dns-forward-max values. bug: 1482847 https://bugzilla.redhat.com/show_bug.cgi?id=1482847
* | | | | Merge pull request #5722 from qinpingli/sc_openstackOpenShift Merge Robot2017-10-313-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Create default storageclass for cloudprovider openstack With this patch, a default storageclass will be created on openstack cloudprovider after installation.
| * | | | | Modify StorageClass name to standardPing Qin2017-10-301-1/+1
| | | | | |
| * | | | | Create default storageclass for cloudprovider openstackPing Qin2017-10-273-2/+8
| | | | | |
* | | | | | Merge pull request #5940 from sdodson/nevragainOpenShift Merge Robot2017-10-311-20/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Also require that we match the release Since we're now only bumping the release field if you've already got openshift-ansible-3.7.0-0.1 and you try to install openshift-ansible-3.7.0-0.2 it won't upgrade all the dependencies but it should.
| * | | | | | Also require that we match the releaseScott Dodson2017-10-301-20/+20
| | | | | | |
* | | | | | | Merge pull request #4560 from tremble/always_runOpenShift Merge Robot2017-10-310-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. replace deprecated always_run with check_mode: no Prior to Ansible 2.2 only the the equivalent of check_mode: no existed. The notation for that was always_run: yes. always_run now generates a deprecation warning: > [DEPRECATION WARNING]: always_run is deprecated. Use check_mode = no instead.. > This feature will be removed in version 2.4. Deprecation warnings can be > disabled by setting deprecation_warnings=False in ansible.cfg.
| * | | | | | | replace deprecated always_run with check_mode: noMark Chappell2017-06-233-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to Ansible 2.2 only the the equivalent of check_mode: no existed. The notation for that was always_run: yes. always_run now generates a deprecation warning: [DEPRECATION WARNING]: always_run is deprecated. Use check_mode = no instead.. This feature will be removed in version 2.4. Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg.
* | | | | | | | Merge pull request #5933 from kwoodson/remove_unneeded_setupOpenShift Merge Robot2017-10-301-17/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Removing unneeded bootstrap which moved into the product. Removing unneeded code now that it has moved officially into the product.
| * | | | | | | | Removing unneeded bootstrap which moved into the product.Kenny Woodson2017-10-301-17/+0
| | | | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.188.0].Jenkins CD Merge Bot2017-10-312-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #5884 from barlik/masterOpenShift Merge Robot2017-10-302-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix broken oc_secret update function
| * | | | | | | | | Fix broken oc_secret update functionRastislav Barlik2017-10-282-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5915 from sdodson/bz1507061OpenShift Merge Robot2017-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Correctly install cockpit Seems this was changed inadvertantly in #5378 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1507061
| * | | | | | | | | Correctly install cockpitScott Dodson2017-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems this was changed inadvertantly in #5378
* | | | | | | | | | Merge pull request #5888 from jcantrill/1501599_allow_project_overcommitOpenShift Merge Robot2017-10-301-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. bug 1501599. Omit logging project from overcommit restrictions This PR: * Annotates the logging project to remove overcommit restrictions
| * | | | | | | | | | bug 1501599. Omit logging project from overcommit restrictionsJeff Cantrill2017-10-251-0/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5917 from ashcrow/kennys-patchScott Dodson2017-10-303-5/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docker: Create openshift_docker_is_node_or_master variable
| * | | | | | | | | | | docker: Create openshift_docker_is_node_or_master variableSteve Milner2017-10-273-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used in place of: inventory_hostname in groups['oo_masters_to_config'] or \ inventory_hostname in groups['oo_nodes_to_config'] While the previous version works, this change helps with the tasks are run during AMI creation. Code written by Kenny Woodson @kwoodson.
* | | | | | | | | | | | Merge pull request #5867 from chinacoolhacker/masterOpenShift Merge Robot2017-10-3010-0/+547
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS suppot for OpenShift v1.5 Added files and templates for OpenShift v1.5
| * | | | | | | | | | | Glusterfs storage templates for v1.5 addedchinacoolhacker2017-10-2510-0/+547
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5769 from jarrpa/image-revertOpenShift Merge Robot2017-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS: Remove image option from heketi command Reverts #5562, option has been removed from heketi command Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1502054 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | | | | | GlusterFS: Remove image option from heketi commandJose A. Rivera2017-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts #5562, option has been removed from heketi command Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | | | | | | Merge pull request #5864 from JacobTanenbaum/new-CIDROpenShift Merge Robot2017-10-301-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. add new clusterNetworks fields to new installs add clusterNetworks field to the networkConfig so that the new fields appear in new installs
| * | | | | | | | | | | | add new clusterNetworks fields to new installsJacob Tanenbaum2017-10-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add clusterNetworks field to the networkConfig so that the new fields appear in new installs when openshift version is greater then 3.7
* | | | | | | | | | | | | Merge pull request #5720 from sdodson/issue5108Scott Dodson2017-10-303-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | Add dm_thin_pool for gluster use
| * | | | | | | | | | | | Add dm_thin_pool for gluster useScott Dodson2017-10-303-0/+26
| | | | | | | | | | | | |
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.187.0].Jenkins CD Merge Bot2017-10-302-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.186.0].Jenkins CD Merge Bot2017-10-292-2/+5
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.185.0].Jenkins CD Merge Bot2017-10-282-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | | Merge pull request #5899 from staebler/update_service_catalog_binary_nameOpenShift Merge Robot2017-10-272-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update the name of the service-catalog binary Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506541.
| * | | | | | | | | | | | Update the name of the service-catalog binarystaebler2017-10-262-2/+4
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5816 from sosiouxme/20171019-disk-check-sum-varOpenShift Merge Robot2017-10-272-3/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. disk_availability check: include submount storage Fixes bug [1491566](https://bugzilla.redhat.com/show_bug.cgi?id=1491566) In order to determine how much storage is under a path, include any mounts that are below it in addition to the path itself.
| * | | | | | | | | | | | disk_availability check: include submount storageLuke Meyer2017-10-202-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1491566 https://bugzilla.redhat.com/show_bug.cgi?id=1491566 In order to determine how much storage is under a path, include any mounts that are below it in addition to the path itself.
* | | | | | | | | | | | | Merge pull request #5897 from jcantrill/1506073_cpu_request_match_limitOpenShift Merge Robot2017-10-278-7/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. bug 1506073. Lower cpu request for logging when it exceeds limit This PR fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506073 by: * Lowering the CPU request to match the limit when the request is greater then a specified limit I have an open question on if this is an acceptable change of if it makes the outcome unexpected. Should we prefer to exit during the deployment and advise the operator to correct their inventory?
| * | | | | | | | | | | | | bug 1506073. Lower cpu request for logging when it exceeds limitJeff Cantrill2017-10-278-7/+50
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.184.0].Jenkins CD Merge Bot2017-10-272-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | | | Merge pull request #3806 from jcantrill/upgrade_logging_invalidOpenShift Merge Robot2017-10-271-79/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Upgrade logging invalid
| * | | | | | | | | | | | bug 1435144. Remove uneeded upgrade in openshift_logging roleJeff Cantrill2017-10-271-79/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5887 from kwoodson/rename_csrKenny Woodson2017-10-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming csr to bootstrap for consistency.
| * | | | | | | | | | | | | Renaming csr to bootstrap for consistency.Kenny Woodson2017-10-252-2/+2
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5916 from mrunalp/crio_log_size_maxScott Dodson2017-10-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | cri-o: Set max log size to 50 mb
| * | | | | | | | | | | | cri-o: Set max log size to 50 mbMrunal Patel2017-10-271-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mrunal Patel <mrunalp@gmail.com>