summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-varsOpenShift Merge Robot2017-11-074-49/+48
|\
| * Fix prometheus default varsMichael Gugino2017-11-074-49/+48
* | Merge pull request #6009 from dymurray/templateOpenShift Merge Robot2017-11-072-2/+18
|\ \
| * | Proper quotesDylan Murray2017-11-031-2/+2
| * | Update service broker configmap and serviceaccount privilegesDylan Murray2017-11-032-2/+18
* | | Merge pull request #6031 from abutcher/temporary-servinginfo-clientcaOpenShift Merge Robot2017-11-062-1/+31
|\ \ \
| * | | Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during ro...Andrew Butcher2017-11-062-1/+31
* | | | Merge pull request #5976 from fabianvf/asb-etcd-certsScott Dodson2017-11-063-13/+174
|\ \ \ \
| * | | | Bug 1507617- Move etcd into its own service/dc with SSLFabian von Feilitzsch2017-11-033-13/+174
* | | | | Merge pull request #6027 from mgugino-upstream-stage/retry-restart-master-con...OpenShift Merge Robot2017-11-065-7/+30
|\ \ \ \ \
| * | | | | Retry restarting master controllersMichael Gugino2017-11-065-7/+30
| | |/ / / | |/| | |
* | | | | Merge pull request #6030 from giuseppe/fix-selinux-docker-tooOpenShift Merge Robot2017-11-062-4/+9
|\ \ \ \ \
| * | | | | container-engine: ensure /var/lib/containers/ is properly labelledGiuseppe Scrivano2017-11-062-4/+9
* | | | | | Merge pull request #6007 from kwoodson/container_locationOpenShift Merge Robot2017-11-062-0/+48
|\ \ \ \ \ \
| * | | | | | Moving docker location to share path with system containers.Kenny Woodson2017-11-062-0/+48
* | | | | | | Merge pull request #6026 from fabianvf/1509680-asb-credential-checkScott Dodson2017-11-064-5/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Bug 1509680- Fix ansible-service-broker registry validationsFabian von Feilitzsch2017-11-064-5/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5994 from djzager/bz1509052-broker-logfileScott Dodson2017-11-061-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bug 1509052 - Remove logfile from broker configDavid Zager2017-11-021-1/+0
* | | | | | Merge pull request #5988 from mgugino-upstream-stage/github-auth-fixScott Dodson2017-11-061-4/+2
|\ \ \ \ \ \
| * | | | | | Fix github auth validationMichael Gugino2017-11-021-4/+2
| |/ / / / /
* | | | | | Merge pull request #5836 from jkroepke/issue_5835Scott Dodson2017-11-062-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Re-generate lib_openshiftJan-Otto Kröpke2017-10-251-1/+1
| * | | | | Remove provisioner restrictions on oc_storageclassJan-Otto Kröpke2017-10-221-1/+1
* | | | | | Merge pull request #6010 from fabianvf/1507787-asb-fix-ocp-defaultsScott Dodson2017-11-051-1/+1
|\ \ \ \ \ \
| * | | | | | Bug 1507787- add full path to default asb etcd imageFabian von Feilitzsch2017-11-031-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Revert "Bootstrap enhancements."Clayton Coleman2017-11-0523-321/+273
* | | | | | Merge pull request #5991 from tbielawa/gate_cfmeOpenShift Merge Robot2017-11-042-4/+64
|\ \ \ \ \ \
| * | | | | | management: enterprise users must acknowledge use of beta softwareTim Bielawa2017-11-032-4/+64
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6006 from mgugino-upstream-stage/elb-v2OpenShift Merge Robot2017-11-0323-273/+321
|\ \ \ \ \ \
| * | | | | | Bootstrap enhancements.Kenny Woodson2017-11-0323-273/+321
* | | | | | | Merge pull request #6005 from mgugino-upstream-stage/fix-master-version-detectOpenShift Merge Robot2017-11-032-1/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix master upgrade version detect and systemd enableMichael Gugino2017-11-032-1/+12
* | | | | | | | Merge pull request #5983 from ewolinetz/37_bz1508150OpenShift Merge Robot2017-11-031-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Using the currently attached pvc for an ES dc if available, otherwise falling...Eric Wolinetz2017-11-011-2/+2
* | | | | | | | Merge pull request #5959 from sdodson/sc-asb-tsb-on-by-defaultOpenShift Merge Robot2017-11-036-10/+28
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use client binary and well defined kubeconfigScott Dodson2017-11-023-8/+8
| * | | | | | | Ensure install and remove are mutually exclusive viaScott Dodson2017-11-021-0/+18
| * | | | | | | Enable SC, ASB, TSB by defaultScott Dodson2017-11-022-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5992 from abutcher/old-repo-fileOpenShift Merge Robot2017-11-031-0/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove old /etc/yum.repos.d/openshift_additional.repo file.Andrew Butcher2017-11-021-0/+5
| |/ / / / /
* | | | | | Merge pull request #5995 from ashcrow/docker-gc-daemonsetOpenShift Merge Robot2017-11-034-0/+101
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | openshift_hosted: Add docker-gcSteve Milner2017-11-024-0/+101
| |/ / / /
* | | | | Merge pull request #5945 from kwoodson/elb_fixesOpenShift Merge Robot2017-11-038-64/+74
|\ \ \ \ \
| * | | | | Adding elb changes to provision elbs and add to scale group.Kenny Woodson2017-11-018-64/+74
* | | | | | Merge pull request #5989 from tbielawa/bz1506951OpenShift Merge Robot2017-11-031-1/+13
|\ \ \ \ \ \
| * | | | | | CFME: Use cluster_hostname if cluster_public_hostname isn't availableTim Bielawa2017-11-021-1/+13
* | | | | | | Merge pull request #5977 from staebler/1507598-patch_permissions_for_service_...OpenShift Merge Robot2017-11-032-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Give admin and edit roles permission to patch ServiceInstances and ServiceBin...staebler2017-11-012-4/+5
* | | | | | | | Merge pull request #5979 from kwoodson/move_node_config_locationOpenShift Merge Robot2017-11-022-4/+7
|\ \ \ \ \ \ \ \