summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5955 from ↵OpenShift Merge Robot2017-11-012-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/remove-docker-etc-containers-regs Automatic merge from submit-queue. Docker: make use of new etc/containers/registries.conf optional Currently, not all versions of docker support using /etc/containers/registries.conf This commit makes the use of that file optional.
| * Docker: make use of new etc/containers/registries.conf optionalMichael Gugino2017-10-312-0/+2
| | | | | | | | | | | | | | Currently, not all versions of docker support using /etc/containers/registries.conf This commit makes the use of that file optional.
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.189.0].Jenkins CD Merge Bot2017-11-012-2/+34
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #5953 from sdodson/bind-dynamicOpenShift Merge Robot2017-10-311-1/+1
|\ \ | | | | | | | | | | | | Automatic merge from submit-queue. Switch from bind-interfaces to bind-dynamic
| * | Switch from bind-interfaces to bind-dynamicScott Dodson2017-10-311-1/+1
| | |
* | | Merge pull request #5956 from smarterclayton/delete_build_istanceClayton Coleman2017-10-311-0/+6
|\ \ \ | | | | | | | | Ensure GCP image build instance gets cleaned up on teardown
| * | | Ensure GCP image build instance gets cleaned up on teardownClayton Coleman2017-10-311-0/+6
| | | |
* | | | Merge pull request #5957 from kwoodson/doc_fix_cert_requiredScott Dodson2017-10-311-0/+1
|\ \ \ \ | | | | | | | | | | Stating that certificate it is required when doing SSL on ELB.
| * | | | Stating that certificate it is required when doing SSL on ELB.Kenny Woodson2017-10-311-0/+1
|/ / / /
* | | | Merge pull request #5949 from mgugino-upstream-stage/ha_controller_ttlOpenShift Merge Robot2017-10-312-4/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove unused osm_controller_lease_ttl This variable is no longer used and references should be removed. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1507449
| * | | Remove unused osm_controller_lease_ttlMichael Gugino2017-10-312-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable is no longer used and references should be removed. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1507449
* | | | Merge pull request #4571 from wongma7/efs-followMichael Gugino2017-10-317-17/+22
|\ \ \ \ | |_|_|/ |/| | | Add blank storageClassName to provisioner PVC & PV template
| * | | Give PV & PVC empty storage class to avoid being assigned default gp2Matthew Wong2017-10-272-0/+2
| | | |
| * | | Use oc_project to ensure openshift_provisioners_project presentMatthew Wong2017-10-271-12/+5
| | | |
| * | | Fix yaml formattingMatthew Wong2017-10-274-5/+15
| | | |
* | | | Merge pull request #5936 from sdodson/arbitrary-fw-rulesOpenShift Merge Robot2017-10-312-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add arbitrary firewall port config to master too
| * | | | Add arbitrary firewall port config to master tooScott Dodson2017-10-302-1/+9
| | | | |
* | | | | Merge pull request #5929 from ↵OpenShift Merge Robot2017-10-312-10/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/remove-master-service-during-non-ha-to-ha-upgrade Automatic merge from submit-queue. remove master.service during the non-ha to ha upgrade Bug: 1506165
| * | | | | remove master.service during the non-ha to ha upgradeJan Chaloupka2017-10-302-10/+15
| | | | | |
* | | | | | Merge pull request #5924 from smarterclayton/bootstrap_cleanupOpenShift Merge Robot2017-10-317-9/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GCP cannot use growpart utils from AWS due to conflicting package Allow cloud provider specific packages to be specified. Also, fix a wait condition in openshift_gcp to allow masters to be bootstrapped nodes. @kwoodson
| * | | | | Delete images located in a family named {{ prefix }}imagesClayton Coleman2017-10-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows CI jobs to create images specifically for this cluster and then remove them afterwards.
| * | | | | Use global IP to indicate node should pick DNSClayton Coleman2017-10-301-0/+1
| | | | | |
| * | | | | Remove project metadata prefixed with the cluster prefixClayton Coleman2017-10-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Allows other scripts to create metadata that is cleaned up safely.
| * | | | | Use openshift.node.registry_url instead of oreg_urlClayton Coleman2017-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Consistent with other use
| * | | | | Allow master node group to wait for stable on GCPClayton Coleman2017-10-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Masters can be in a bootstrap config, but allow them to wait for stable so that we don't have inventory issues.
| * | | | | GCP cannot use AWS growpart packageClayton Coleman2017-10-303-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Make the required package optional
* | | | | | 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
| | | | | | | | | | | |