summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5942 from giuseppe/crio-sync-configurationScott Dodson2017-11-141-0/+5
|\ | | | | crio: sync crio.conf
| * crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #5921 from lpsantil/make-nfs-clearMichael Gugino2017-11-141-6/+18
|\ \ | |/ |/| Make clearer *_nfs_directory and *_volume_name
| * Make clearer *_nfs_directory and *_volume_namelpsantil2017-10-281-6/+18
| |
* | Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-jsonScott Dodson2017-11-135-17/+10
|\ \ | | | | | | Fix extension script for catalog
| * | Fix extension script for catalogMichael Gugino2017-11-135-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, playbook wire_aggregator places an empty plugin script for openshift master called openshift-ansible-catalog-console.js This file should not be empty if using template_service_broker. I have updated this file to include a boolean and the proper string. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506502
* | | Merge pull request #6104 from kwoodson/regex_cors_fixScott Dodson2017-11-131-2/+2
|\ \ \ | | | | | | | | Regex anchors changed to match protocol start and ports.
| * | | Regex anchors changed to match protocol start and ports.Kenny Woodson2017-11-131-2/+2
| | | |
* | | | Merge pull request #6072 from tbielawa/obvious_docsOpenShift Merge Robot2017-11-131-15/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update Docs. Make Clearer where the actual docs are. This just makes it more obvious where the openshift docs are.
| * | | Update Docs. Make Clearer where the actual docs are.Tim Bielawa2017-11-091-15/+15
| | | |
* | | | Merge pull request #6100 from sdodson/v3_8-supportScott Dodson2017-11-13175-11/+88657
|\ \ \ \ | |_|/ / |/| | | First pass at v3.8 support
| * | | First pass at v3.8 supportScott Dodson2017-11-13175-11/+88657
|/ / /
* | | Bumping openshift-ansible to 3.8Jenkins CD Merge Bot2017-11-101-2/+2
| | |
* | | Merge pull request #5997 from mcanevet/patch-1OpenShift Merge Robot2017-11-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix contenerized documentation?
| * | | Fix contenerized documentation?Mickaël Canévet2017-11-031-1/+1
| | | | | | | | | | | | Are you really suggestion to deploy heterogeneous environments?
* | | | Merge pull request #5571 from vshn/registryip1OpenShift Merge Robot2017-11-093-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Allow cluster IP for docker-registry service to be set For historical reasons a small set of programs in our environments rely on the cluster-internal Docker registry having the IP address "172.30.1.1". So far we always had to patch in that address manually. Adding a variable on the "openshift_hosted" role allows the IP address to be set correctly when a cluster is installed.
| * | | Allow cluster IP for docker-registry service to be setMichael Hanselmann2017-10-193-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reasons a small set of programs in our environments rely on the cluster-internal Docker registry having the IP address "172.30.1.1". So far we always had to patch in that address manually. Adding a variable on the "openshift_hosted" role allows the IP address to be set correctly when a cluster is installed.
* | | | Automatic commit of package [openshift-ansible] release [3.7.5-1].Jenkins CD Merge Bot2017-11-092-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.4-1].Jenkins CD Merge Bot2017-11-082-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.3-1].Jenkins CD Merge Bot2017-11-082-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #6067 from shawn-hurley/bug-specify-keep-namespaceScott Dodson2017-11-082-0/+4
|\ \ \ \ | | | | | | | | | | Bug 151186 - Adding configuration for keeping transient namespace on error.
| * | | | Adding configuration for keeping transient namespace on error.Shawn Hurley2017-11-082-0/+4
| | | | |
* | | | | Merge pull request #6020 from sdodson/asb-tsbScott Dodson2017-11-086-11/+11
|\ \ \ \ \ | | | | | | | | | | | | Remove duplicate defaulting for ASB and TSB
| * | | | | Use openshift.common.client_binaryScott Dodson2017-11-082-5/+5
| | | | | |
| * | | | | Remove duplicate defaulting for ASB and TSBScott Dodson2017-11-084-6/+6
| |/ / / /
* | | | | Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3Kenny Woodson2017-11-0826-353/+363
|\ \ \ \ \ | | | | | | | | | | | | Bootstrap enhancements.
| * | | | | Bootstrap enhancements.Kenny Woodson2017-11-0826-353/+363
| | | | | |
* | | | | | Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310Scott Dodson2017-11-086-25/+81
|\ \ \ \ \ \ | | | | | | | | | | | | | | reconcile registry-console and docker_image_availability
| * | | | | | reconcile registry-console and docker_image_availabilityLuke Meyer2017-11-066-25/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1497310 https://bugzilla.redhat.com/show_bug.cgi?id=1497310 The registry console is a special case in more than one way. This adds logic to incorporate the openshift_cockpit_deployer_* variables into determining what its image will be in docker_image_availability. Along the way I noticed the origin and enterprise templates for this were not consistent. Now they are, and the example hosts file is updated.
* | | | | | | Merge pull request #6063 from mgugino-upstream-stage/upgrade-minor-validator-fixScott Dodson2017-11-082-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix preupgrade authorization objects are in sync minor versions
| * | | | | | | Fix preupgrade authorization objects are in sync minor versionsMichael Gugino2017-11-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we check that upgrade target is less than 3.8, but this will break for minor upgrades. This commit set's a fact early in the upgrade process to deterime what the currently installed version on the first master is. This fact is used to determine if our currently installed version is less than 3.7. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508301
* | | | | | | | Merge pull request #6065 from mgugino-upstream-stage/fix-examples-image-streamsScott Dodson2017-11-082-0/+208
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix examples image streams
| * | | | | | | Fix examples image streamsMichael Gugino2017-11-082-0/+208
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image streams older than 3.7 do not have a separate config for centos for dotnet_imagestreams.json This commit copies the new image stream to older supported verisons.
* | | | | | | Merge pull request #5966 from sdodson/iss-masterScott Dodson2017-11-08143-25707/+2564
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update to xpaas v1.4.6 content
| * | | | | | | General template updates for v3.7Scott Dodson2017-11-0811-65/+35
| | | | | | | |
| * | | | | | | Update to xPaaS v1.4.6Scott Dodson2017-11-08132-25642/+2529
| | | | | | | |
* | | | | | | | Merge pull request #6060 from zgalor/change_default_namespaceScott Dodson2017-11-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change prometheus default namespace to 'openshift-metrics'
| * | | | | | | | Change prometheus default namespace to 'openshift-metrics'Zohar Galor2017-11-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookupScott Dodson2017-11-081-3/+12
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Bug 1511044- Slurp the etcd certs instead of using the lookup
| * | | | | | | | Bug 1511044- Slurp the etcd certs instead of using the lookupFabian von Feilitzsch2017-11-081-3/+12
| |/ / / / / / /
* | / / / / / / Automatic commit of package [openshift-ansible] release [3.7.2-1].Jenkins CD Merge Bot2017-11-082-2/+8
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6061 from zgalor/remove_debugScott Dodson2017-11-081-9/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove debug code that was mistakenly committed
| * | | | | | | Remove debug code that was mistakenly committedZohar Galor2017-11-081-9/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also causes a failure if nfs block is not defined, because the condition is missing. Anyway this shouldn't have been committed.
* | | | | | | Merge pull request #6035 from ↵Scott Dodson2017-11-081-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staebler/1499413-service_catalog_class_and_plan_status_updates Give service-catalog controller-manager permissions to update status of ClusterServiceClasses and ClusterServicePlans
| * | | | | | | Give service-catalog controller-manager permissions to update status of ↵staebler2017-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClusterServiceClasses and ClusterServicePlans
* | | | | | | | Merge pull request #6055 from sdodson/bz1510746Scott Dodson2017-11-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correct service restart command
| * | | | | | | | Correct service restart commandScott Dodson2017-11-081-1/+1
| | | | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.1-1].Jenkins CD Merge Bot2017-11-082-3/+6
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6052 from fabianvf/1510636-asb-local-registry-nameScott Dodson2017-11-081-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bug 1510636- add name to local registry config
| * | | | | | | | Bug 1510636- add name to local registry configFabian von Feilitzsch2017-11-071-3/+4
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 04:48:08 +0000