summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-08Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310Scott Dodson
reconcile registry-console and docker_image_availability
2017-11-08Merge pull request #6063 from mgugino-upstream-stage/upgrade-minor-validator-fixScott Dodson
Fix preupgrade authorization objects are in sync minor versions
2017-11-08Merge pull request #6065 from mgugino-upstream-stage/fix-examples-image-streamsScott Dodson
Fix examples image streams
2017-11-08Fix examples image streamsMichael Gugino
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.
2017-11-08Merge pull request #5966 from sdodson/iss-masterScott Dodson
Update to xpaas v1.4.6 content
2017-11-08Merge pull request #6060 from zgalor/change_default_namespaceScott Dodson
Change prometheus default namespace to 'openshift-metrics'
2017-11-08Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookupScott Dodson
Bug 1511044- Slurp the etcd certs instead of using the lookup
2017-11-08Fix preupgrade authorization objects are in sync minor versionsMichael Gugino
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
2017-11-08General template updates for v3.7Scott Dodson
2017-11-08Update to xPaaS v1.4.6Scott Dodson
2017-11-08Automatic commit of package [openshift-ansible] release [3.7.2-1].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-11-08Merge pull request #6061 from zgalor/remove_debugScott Dodson
Remove debug code that was mistakenly committed
2017-11-08Remove debug code that was mistakenly committedZohar Galor
This also causes a failure if nfs block is not defined, because the condition is missing. Anyway this shouldn't have been committed.
2017-11-08Bug 1511044- Slurp the etcd certs instead of using the lookupFabian von Feilitzsch
2017-11-08Change prometheus default namespace to 'openshift-metrics'Zohar Galor
2017-11-08Merge pull request #6035 from ↵Scott Dodson
staebler/1499413-service_catalog_class_and_plan_status_updates Give service-catalog controller-manager permissions to update status of ClusterServiceClasses and ClusterServicePlans
2017-11-08Merge pull request #6055 from sdodson/bz1510746Scott Dodson
Correct service restart command
2017-11-08Automatic commit of package [openshift-ansible] release [3.7.1-1].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-11-08Merge pull request #6052 from fabianvf/1510636-asb-local-registry-nameScott Dodson
Bug 1510636- add name to local registry config
2017-11-08Correct service restart commandScott Dodson
2017-11-08Automatic commit of package [openshift-ansible] release [3.7.0-0.198.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-11-07Merge pull request #6023 from ↵Scott Dodson
Miciah/bz1509163-openshift_checks-add-ovs-versions-for-ocp-3.7 openshift_checks: Add OVS versions for OCP 3.7
2017-11-07Merge pull request #5903 from sdodson/dotnet-centosScott Dodson
Add centos based dotnet 2.0 image streams
2017-11-07Merge pull request #6042 from sdodson/image-stream-syncScott Dodson
Fix xPaaS image streams
2017-11-07Merge pull request #6046 from mgugino-upstream-stage/fix-github-challenge-authScott Dodson
Re-add challenge auth verification to github and google
2017-11-07Merge pull request #6047 from sdodson/kubectlScott Dodson
Use oc rather than kubectl
2017-11-07Merge pull request #6050 from ashcrow/possible-fix-for-scottScott Dodson
container_binary_sync: Remove atomic prefix from image
2017-11-07Bug 1510636- add name to local registry configFabian von Feilitzsch
2017-11-07Merge pull request #6040 from kwoodson/router_shard_custom_cert_fixScott Dodson
[Bug 1509354] Check if routers have certificates and use them
2017-11-07container_binary_sync: Remove atomic prefix from imageSteve Milner
Signed-off-by: Steve Milner <smilner@redhat.com>
2017-11-07Merge pull request #6048 from fabianvf/1510546-asb-fix-cert-indentScott Dodson
Bug 1510546- Fix previous fix, task was indented one level too deep
2017-11-07Bug 1510546- Fix previous fix, task was indented one level too deepFabian von Feilitzsch
2017-11-07Use oc rather than kubectlScott Dodson
2017-11-07Merge pull request #6044 from fabianvf/1510546-asb-fix-cert-conditionalScott Dodson
Fix ansible service broker etcd cert generation logic.
2017-11-07Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-varsOpenShift Merge Robot
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
2017-11-07Merge pull request #6009 from dymurray/templateOpenShift Merge Robot
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
2017-11-07Re-add challenge auth verification to github and googleMichael Gugino
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
2017-11-07Merge pull request #5998 from SaravanaStorageNetwork/fix_for_etcdMichael Gugino
Add etcd as part of inventory file
2017-11-07Move fact definition that breaks when check to end of blockFabian von Feilitzsch
2017-11-07[Bug 1509354] Check if routers have certificates and use themKenny Woodson
2017-11-07Fix v3.6 xpaas image streamsScott Dodson
2017-11-07Fix v3.7 xpaas image streamsScott Dodson
2017-11-07Fix prometheus default varsMichael Gugino
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
2017-11-07Automatic commit of package [openshift-ansible] release [3.7.0-0.197.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-11-06Merge pull request #6031 from abutcher/temporary-servinginfo-clientcaOpenShift Merge Robot
Automatic merge from submit-queue. Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during rolling CA redeployment. This PR temporarily configures master `servingInfo.clientCA` as `client-ca-bundle.crt` during CA redeploy so that clients referencing the old OpenShift CA can continue to function until all cluster certificates have been replaced and `servingInfo.clientCA` is reset to `ca.crt`. `client-ca-bundle.crt` is a new bundle created by the `openshift_ca` role which contains old and new OpenShift CA certificates. https://bugzilla.redhat.com/show_bug.cgi?id=1509124 Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1493276
2017-11-06Merge pull request #5976 from fabianvf/asb-etcd-certsScott Dodson
Bug 1507617- Move etcd into its own service/dc with SSL
2017-11-06Merge pull request #6027 from ↵OpenShift Merge Robot
mgugino-upstream-stage/retry-restart-master-controllers Automatic merge from submit-queue. Retry restarting master controllers Currently, master controller services may fail to restart if master api services are not fully initialized. This commit enables retry of master controllers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509837
2017-11-06Merge pull request #6024 from mgugino-upstream-stage/upgrade-validator-fixOpenShift Merge Robot
Automatic merge from submit-queue. Fix preupgrade authorization objects are in sync Currently, this task is executed based on openshift_version. openshift_version is based on the upgrade target, thus not the currently install versions. This commit ensures that the task executes as intended. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508301
2017-11-06Merge pull request #6030 from giuseppe/fix-selinux-docker-tooOpenShift Merge Robot
Automatic merge from submit-queue. container-engine: ensure /var/lib/containers/ is properly labelled we were doing it only when CRI-O is installed. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1509880 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-11-06Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during ↵Andrew Butcher
rolling CA redeployment.
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-15 02:57:40 +0000