summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.198.0].Jenkins CD Merge Bot2017-11-082-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6023 from ↵Scott Dodson2017-11-073-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Miciah/bz1509163-openshift_checks-add-ovs-versions-for-ocp-3.7 openshift_checks: Add OVS versions for OCP 3.7
| * | | | | openshift_checks: Add OVS versions for OCP 3.7Miciah Masters2017-11-063-3/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the ovs_version check with the allowed Open vSwitch versions for OCP 3.7. Add OVS 2.8 to the allowed versions for OCP 3.6 as well. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1509163
* | | | | Merge pull request #5903 from sdodson/dotnet-centosScott Dodson2017-11-074-4/+113
|\ \ \ \ \ | | | | | | | | | | | | Add centos based dotnet 2.0 image streams
| * | | | | Add centos based dotnet 2.0 image streamsScott Dodson2017-10-274-4/+113
| | | | | |
* | | | | | Merge pull request #6042 from sdodson/image-stream-syncScott Dodson2017-11-072-19/+511
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix xPaaS image streams
| * | | | | | Fix v3.6 xpaas image streamsScott Dodson2017-11-071-9/+307
| | | | | | |
| * | | | | | Fix v3.7 xpaas image streamsScott Dodson2017-11-071-10/+204
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6046 from mgugino-upstream-stage/fix-github-challenge-authScott Dodson2017-11-071-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Re-add challenge auth verification to github and google
| * | | | | | Re-add challenge auth verification to github and googleMichael Gugino2017-11-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent commit removed these checks. These two auth providers are specifically excluded in origin, thus we should enable the checks to ensure challenge auth is not enabled for these providers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1444367
* | | | | | | Merge pull request #6047 from sdodson/kubectlScott Dodson2017-11-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use oc rather than kubectl
| * | | | | | | Use oc rather than kubectlScott Dodson2017-11-071-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6050 from ashcrow/possible-fix-for-scottScott Dodson2017-11-071-1/+28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | container_binary_sync: Remove atomic prefix from image
| * | | | | | container_binary_sync: Remove atomic prefix from imageSteve Milner2017-11-071-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | | Merge pull request #6040 from kwoodson/router_shard_custom_cert_fixScott Dodson2017-11-071-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [Bug 1509354] Check if routers have certificates and use them
| * | | | | | [Bug 1509354] Check if routers have certificates and use themKenny Woodson2017-11-071-3/+6
| | | | | | |
* | | | | | | Merge pull request #6048 from fabianvf/1510546-asb-fix-cert-indentScott Dodson2017-11-071-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bug 1510546- Fix previous fix, task was indented one level too deep
| * | | | | | | Bug 1510546- Fix previous fix, task was indented one level too deepFabian von Feilitzsch2017-11-071-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #6044 from fabianvf/1510546-asb-fix-cert-conditionalScott Dodson2017-11-071-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix ansible service broker etcd cert generation logic.
| * | | | | | | Move fact definition that breaks when check to end of blockFabian von Feilitzsch2017-11-071-11/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-varsOpenShift Merge Robot2017-11-074-49/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix prometheus default vars Currently, prometheus role tries to set some defaults depending on openshift_deployment_type. This commit simplifies that logic. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509782
| * | | | | | | Fix prometheus default varsMichael Gugino2017-11-074-49/+48
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, prometheus role tries to set some defaults depending on openshift_deployment_type. This commit simplifies that logic. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509782
* | | | | | | Merge pull request #6009 from dymurray/templateOpenShift Merge Robot2017-11-072-2/+18
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update service broker configmap and serviceaccount privileges Addresses Bugs https://bugzilla.redhat.com/show_bug.cgi?id=1503289 and https://bugzilla.redhat.com/show_bug.cgi?id=1507111
| * | | | | | Proper quotesDylan Murray2017-11-031-2/+2
| | | | | | |
| * | | | | | Update service broker configmap and serviceaccount privilegesDylan Murray2017-11-032-2/+18
| | | | | | |
* | | | | | | Merge pull request #5998 from SaravanaStorageNetwork/fix_for_etcdMichael Gugino2017-11-075-0/+20
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add etcd as part of inventory file
| * | | | | | Add etcd as part of inventory file.Saravanakumar Arumugam2017-11-035-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, it fails as "Running etcd as an embedded service is no longer supported." Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 00:27:49 +0000