summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5247 from mgugino-upstream-stage/fix-master-upgradesOpenShift Bot2017-08-303-7/+11
|\ | | | | Merged by openshift-bot
| * Fix openshift_master upgradeMichael Gugino2017-08-293-7/+11
| | | | | | | | | | | | | | | | Currently, openshift_master upgrade play imports tasks directly from the openshift_master role. This method does not honor role defaults. This commit changes sets openshift_master_config_dir if undefined.
* | Merge pull request #5188 from mtnbikenc/test-common-entryRussell Teague2017-08-3023-47/+37
|\ \ | | | | | | Test: Fail on entry point playbooks in common
| * | Test: Fail on entry point playbooks in commonRussell Teague2017-08-2923-47/+37
| | |
* | | Merge pull request #5270 from kwoodson/etcd_firewall_defaultsKenny Woodson2017-08-301-2/+2
|\ \ \ | | | | | | | | etcd role will default to global firewall settings when set.
| * | | Added firwall defaults to etcd role.Kenny Woodson2017-08-301-2/+2
| | | |
* | | | Merge pull request #5230 from kwoodson/openshift_node_bootstrapOpenShift Bot2017-08-3021-390/+396
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Merging openshift_node with openshift bootstrap.Kenny Woodson2017-08-2921-391/+397
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.123.0].Jenkins CD Merge Bot2017-08-302-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.0-0.122.0].Jenkins CD Merge Bot2017-08-302-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5258 from ozdanborne/update-calicoScott Dodson2017-08-302-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update calico to v2.5
| * | | | | Update calico to v2.5Dan Osborne2017-08-292-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5268 from abutcher/multi-router-exampleScott Dodson2017-08-302-76/+4
|\ \ \ \ \ | | | | | | | | | | | | Update openshift_hosted_routers example to be in ini format.
| * | | | | Update openshift_hosted_routers example to be in ini format.Andrew Butcher2017-08-302-76/+4
| | | | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.121.0].Jenkins CD Merge Bot2017-08-302-2/+16
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5252 from mtnbikenc/fix-group-conditionalOpenShift Bot2017-08-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Fix group conditional requirementsRussell Teague2017-08-291-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5245 from ewolinetz/fix_oc_serviceScott Dodson2017-08-303-48/+22
|\ \ \ \ \ | |_|/ / / |/| | | | Updating openshift_service_catalog to use oc_service over oc_obj to r…
| * | | | Updating openshift_service_catalog to use oc_service over oc_obj to resolve ↵Eric Wolinetz2017-08-283-48/+22
| | | | | | | | | | | | | | | | | | | | idempotency issues being seen from rerunning role
* | | | | Merge pull request #4568 from simon3z/cfme-nfs-directoryScott Dodson2017-08-304-3/+4
|\ \ \ \ \ | | | | | | | | | | | | openshift_cfme: add nfs directory support
| * | | | | openshift_cfme: add nfs directory supportFederico Simoncelli2017-06-234-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
* | | | | | Merge pull request #5228 from sosiouxme/20170825-timeout-skopeoRodolfo Carvalho2017-08-301-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | docker_image_availability: timeout skopeo inspect
| * | | | | | docker_image_availability: timeout skopeo inspectLuke Meyer2017-08-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a 10 second timeout when using skopeo to inspect remote registries, so that it does not wait for a tcp timeout to fail if they are unreachable.
* | | | | | | Merge pull request #5257 from mtnbikenc/fix-scaleupScott Dodson2017-08-3011-56/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move firewall install and fix scaleup playbooks
| * | | | | | | Move firewall install and fix scaleup playbooksRussell Teague2017-08-2911-56/+11
| | | | | | | |
* | | | | | | | Merge pull request #5229 from sdodson/fix-containerized-etcdv3-migrationScott Dodson2017-08-302-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix scaleup on containerized installations
| * | | | | | | | Fix scaleup on containerized installationsScott Dodson2017-08-252-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output from member add had quotes added that caused etcd to fail. Also there were some places that needed to have retries added because containerized start/stop/restart are slower than rpm based installs.
* | | | | | | | | Merge pull request #5262 from openshift/revert-5119-logging_memory_same_as_limitScott Dodson2017-08-295-11/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "logging set memory request to limit"
| * | | | | | | | | Revert "logging set memory request to limit"Scott Dodson2017-08-295-11/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5119 from jcantrill/logging_memory_same_as_limitScott Dodson2017-08-295-1/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | logging set memory request to limit
| * | | | | | | | | logging set memory request to limitJeff Cantrill2017-08-235-1/+11
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5184 from jcantrill/bz1480878_default_logging_pvc_sizeScott Dodson2017-08-291-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | bug 1480878. Default pvc for logging
| * | | | | | | | | | bug 1480878. Default pvc for loggingJeff Cantrill2017-08-231-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5219 from jcantrill/bz1480988_kibana_ops_linksScott Dodson2017-08-293-0/+20
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | annotate the infra projects for logging to fix bz1480988
| * | | | | | | | | | | annotate the infra projects for logging to fix bz1480988Jeff Cantrill2017-08-283-0/+20
| | | | | | | | | | | |
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.120.0].Jenkins CD Merge Bot2017-08-292-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | | Merge pull request #5220 from rparulek/nuage-atomic-installScott Dodson2017-08-293-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | Nuage changes to add custom mounts for atomic-openshift-node service
| * | | | | | | | | | | Nuage changes to add custom mounts for atomic-openshift-node serviceRohan Parulekar2017-08-293-1/+8
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #4887 from zgalor/fix_oc_route_certificate_validationScott Dodson2017-08-292-10/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only validate certificates that are passed to oc_route
| * | | | | | | | | | | Only validate certificates that are passed to oc_routeZohar Galor2017-08-012-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 3.6 destination ca certifate is not mandatory for tls_termination==reencrypt. Instead of validating that the certificate/key was passed, only validate the content or correct path, before sending request to API.
* | | | | | | | | | | | Merge pull request #5128 from mgugino-upstream-stage/reg-authScott Dodson2017-08-295-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add independent registry auth support
| * | | | | | | | | | | | Add independent registry auth supportMichael Gugino2017-08-285-0/+49
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to support authentication for independent / 3rd party registries. This commit will allow users to provide a `oreg_auth_user` and `oreg_auth_password` to dynmically generate a docker config.json file. The docker config.json file can be used by openshift to authenticate to independent / 3rd party registries. `oreg_host` must supply endpoint connection info in the form of 'hostname.com:port', with (optional) port 443 default. To update the config.json on a later run, the user can specify `oreg_auth_credentials_replace=False` to update the credentials. These settings must be used in tandem with `oreg_url` Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
* | | | | | | | | | | | Merge pull request #5214 from giuseppe/rename_crio_variableScott Dodson2017-08-2912-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | crio: rename openshift_docker_use_crio to openshift_use_crio
| * | | | | | | | | | | roles: use openshift_use_crioGiuseppe Scrivano2017-08-254-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | | | | cri-o: change to system runcGiuseppe Scrivano2017-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of cri-o do not carry runc but use the one from the system. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | | | | cri-o: rename openshift_docker_use_crio to openshift_use_crioGiuseppe Scrivano2017-08-257-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is confusing to have _docker_ in the name, since they are two different backends. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | | Merge pull request #5201 from mtnbikenc/remove-unsupportedRussell Teague2017-08-2989-6522/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Remove unsupported playbooks and utilities
| * | | | | | | | | | | Remove unsupported playbooks and utilitiesRussell Teague2017-08-2589-6522/+8
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #5149 from ewolinetz/bz1479165Eric Wolinetz2017-08-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | Updating default tag for enterprise installation for ASB
| * | | | | | | | | | Updating default tag for enterprise installation for ASBEric Wolinetz2017-08-211-1/+1
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:17:47 +0000