summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5854 from sdodson/image-stream-syncScott Dodson2017-10-2567-215/+14386
|\
| * Sync latest imagestreams and templatesScott Dodson2017-10-2367-215/+14386
* | Merge pull request #5810 from zgalor/refactor-prom-entryOpenShift Merge Robot2017-10-251-0/+7
|\ \
| * | Add installer checkpoint for prometheusZohar Galor2017-10-191-0/+7
* | | Merge pull request #5848 from zgalor/pvc_default_alignScott Dodson2017-10-253-4/+10
|\ \ \
| * | | Change default in prometheus storage type to emptydirZohar Galor2017-10-243-4/+10
* | | | Merge pull request #5857 from wozniakjan/bz_1491636/logging/nodeselectorOpenShift Merge Robot2017-10-251-6/+6
|\ \ \ \
| * | | | Bug 1491636 - honor node selectorsJan Wozniak2017-10-241-6/+6
* | | | | Merge pull request #5787 from zgalor/image_prefixOpenShift Merge Robot2017-10-243-11/+17
|\ \ \ \ \
| * | | | | Split prometheus image defaults to prefix and versionZohar Galor2017-10-243-11/+17
| | |/ / / | |/| | |
* | | | | Merge pull request #5780 from smarterclayton/allow_per_node_group_bootstrap_a...OpenShift Merge Robot2017-10-241-2/+7
|\ \ \ \ \
| * | | | | Handle bootstrap behavior in GCP templateClayton Coleman2017-10-181-2/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #5700 from wozniakjan/bz_1452939OpenShift Merge Robot2017-10-2414-14/+164
|\ \ \ \ \
| * | | | | Bug 1452939 - change Logging & Metrics imagePullPolicyJan Wozniak2017-10-2314-14/+164
* | | | | | Merge pull request #5806 from staebler/service_catalog_uninstall_issuesOpenShift Merge Robot2017-10-247-17/+47
|\ \ \ \ \ \
| * | | | | | Remove extraneous spaces that yamllint dislikesstaebler2017-10-231-3/+3
| * | | | | | Remove role bindings during service catalog un-installstaebler2017-10-225-15/+28
| * | | | | | Fix a few small issues in service catalog uninstallstaebler2017-10-223-6/+23
| |/ / / / /
* | | | | | Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgradesOpenShift Merge Robot2017-10-242-11/+13
|\ \ \ \ \ \
| * | | | | | Enable oreg_auth credential replace during upgradesMichael Gugino2017-10-192-11/+13
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5828 from mgugino-upstream-stage/fix-openid-challengeScott Dodson2017-10-241-1/+0
|\ \ \ \ \ \
| * | | | | | Remove incorrect validation for OpenIDIdentityProviderMichael Gugino2017-10-201-1/+0
* | | | | | | Merge pull request #5840 from staebler/service_catalog_role_patchingOpenShift Merge Robot2017-10-241-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix edit and admin role patching for service catalogstaebler2017-10-231-2/+2
* | | | | | | Merge pull request #5796 from mgugino-upstream-stage/journald-masters-upgradesOpenShift Merge Robot2017-10-242-22/+25
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Ensure upgrades apply latest journald settingsMichael Gugino2017-10-182-22/+25
* | | | | | | Merge pull request #5808 from zgalor/stateful_setScott Dodson2017-10-234-14/+18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Switch to stateful set in prometheusZohar Galor2017-10-234-14/+18
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5654 from vshn/mastersysconfigvar1OpenShift Merge Robot2017-10-231-1/+1
|\ \ \ \ \ \
| * | | | | | Avoid undefined variable in master sysconfig templateMichael Hanselmann2017-10-191-1/+1
| |/ / / / /
* | | | | | Merge pull request #5781 from mgugino-upstream-stage/fix-reg-auth-templatingScott Dodson2017-10-233-3/+12
|\ \ \ \ \ \
| * | | | | | Ensure proper variable templating for skopeo auth credentialsMichael Gugino2017-10-173-3/+12
* | | | | | | Merge pull request #5811 from zgalor/add_nfs_to_readmeScott Dodson2017-10-231-2/+25
|\ \ \ \ \ \ \
| * | | | | | | Add nfs variables documentation to README fileZohar Galor2017-10-191-2/+25
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5822 from ewolinetz/bz1504191Scott Dodson2017-10-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Updating ocp es proxy image to use openshift_logging_proxy_image_prefix if sp...Eric Wolinetz2017-10-191-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #5453 from giuseppe/use-docker-cli-image-if-already-availableOpenShift Merge Robot2017-10-231-5/+8
|\ \ \ \ \ \ \
| * | | | | | | cli: use the correct name for the master system containerGiuseppe Scrivano2017-10-231-2/+2
| * | | | | | | cli: do not pull again the image when using DockerGiuseppe Scrivano2017-10-231-3/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5241 from hansmi/masterScott Dodson2017-10-234-0/+37
|\ \ \ \ \ \ \
| * | | | | | | Add variable to control whether NetworkManager hook is installedMichael Hanselmann2017-10-194-0/+37
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5818 from ashcrow/1503860OpenShift Merge Robot2017-10-232-8/+9
|\ \ \ \ \ \ \
| * | | | | | | docker: Move enterprise registry from pkg to mainSteve Milner2017-10-192-8/+9
| |/ / / / / /
* | | | | | | Merge pull request #5761 from fabianvf/asb-client-secret-not-foundScott Dodson2017-10-234-22/+24
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update defaultsFabian von Feilitzsch2017-10-194-5/+9
| * | | | | | Use service-ca.crt instead of master ca.crtFabian von Feilitzsch2017-10-191-16/+11
| * | | | | | use master certFabian von Feilitzsch2017-10-191-2/+2
| * | | | | | Bug 1496426 - add asb-client secret to openshift-ansible-service-broker names...Fabian von Feilitzsch2017-10-191-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5813 from ashcrow/1503903OpenShift Merge Robot2017-10-239-62/+101
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | systemcontainers: Verify atomic.conf proxy is always configuredSteve Milner2017-10-199-62/+101
| | |/ / / | |/| | |