summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5209 from wozniakjan/logging_es_probeOpenShift Bot2017-09-072-1/+15
|\ | | | | Merged by openshift-bot
| * elasticsearch: reintroduce readiness probeJan Wozniak2017-08-292-1/+15
| |
* | Merge pull request #5211 from kwoodson/provisioning_fixesScott Dodson2017-09-0757-1554/+1155
|\ \ | | | | | | Provisioning updates.
| * | Consolidating AWS roles and variables underneath openshift_aws role.Kenny Woodson2017-09-0757-1618/+1149
| | |
| * | Fixing variables and allowing custom ami.Kenny Woodson2017-09-076-42/+112
| | |
* | | Merge pull request #5329 from mgugino-upstream-stage/typo-fixAndrew Butcher2017-09-071-1/+1
|\ \ \ | | | | | | | | Fix README.md typo
| * | | Fix README.md typoMichael Gugino2017-09-071-1/+1
| |/ / | | | | | | | | | Small typo in README.md.
* | | Merge pull request #5305 from mtnbikenc/breakout-master-additionalOpenShift Bot2017-09-073-3/+8
|\ \ \ | |/ / |/| | Merged by openshift-bot
| * | Move master additional config out of baseRussell Teague2017-09-053-3/+8
| | |
* | | Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_commonOpenShift Bot2017-09-0769-399/+199
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Remove openshift-commonMichael Gugino2017-09-0669-399/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of this role's purpose was to set facts. The vast majority of these facts were simply redefining user-supplied variables. This commit also removes various artifacts leftover from previous versions, as well as variables that seem to be entirely unused.
* | | | Merge pull request #5310 from ashcrow/split-rhel-centos-crioOpenShift Bot2017-09-071-2/+8
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | cri-o: Split RHEL and CentOS imagesSteve Milner2017-09-061-2/+8
| | | | |
* | | | | Merge pull request #5162 from aerialls/patch-2OpenShift Bot2017-09-071-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | reverse order between router cert generationJulien Brochet2017-08-231-9/+9
| | | | | |
| * | | | | ensured to always use a certificate for the routerJulien Brochet2017-08-221-1/+1
| | | | | |
* | | | | | Merge pull request #5296 from nak3/skeopeo-command-outputOpenShift Bot2017-09-061-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | output skopeo image check commandKenjiro Nakayama2017-09-051-4/+6
| | | | | | |
* | | | | | | Merge pull request #5276 from richm/masterOpenShift Bot2017-09-065-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | logging set memory request to limitJeff Cantrill2017-08-305-1/+11
| | | | | | | |
* | | | | | | | Merge pull request #5148 from kwoodson/registry_proxy_updatesOpenShift Bot2017-09-061-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Adding proxy env vars for dc/docker-registryKenny Woodson2017-08-211-0/+8
| | | | | | | | |
* | | | | | | | | Merge pull request #5067 from e-minguez/flannel_use_sdn_cluster_network_cidrScott Dodson2017-09-062-4/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use the proper pod subnet instead the services one
| * | | | | | | | | Use the proper pod subnet instead the services oneEduardo Minguez Perez2017-08-292-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4809 ?
* | | | | | | | | | Merge pull request #5299 from jhadvig/dnf_issueScott Dodson2017-09-063-12/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Import dnf only if importing yum fails
| * | | | | | | | | | openshift_checks aos_version: also check installed under yumLuke Meyer2017-09-063-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweaks to the logic around using yum vs dnf; now uses ansible_pkg_mgr to determine which is in effect for a host. Also, extended the yum logic to check installed packages in addition to available packages in the aos_version module so that disconnected installs and others with weird repo configs need not disable the package_version check.
| * | | | | | | | | | Import dnf only if importing yum failsJakub Hadvig2017-09-051-6/+12
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot2017-09-062-0/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | cri-o: add support for additional registriesGiuseppe Scrivano2017-08-242-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support added to CRI-O with: https://github.com/kubernetes-incubator/cri-o/commit/a35727c80bd2a26613aae21db00628045cb9be24 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | Merge pull request #5313 from sjenning/remove-experimental-cri-flagScott Dodson2017-09-061-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove experimental-cri flag from node config
| * | | | | | | | | | | remove experimental-cri flag from node configSeth Jennings2017-09-061-2/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5317 from sdodson/masterScott Dodson2017-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Fix openshift_master_config_dir
| * | | | | | | | | | | Fix openshift_master_config_dirScott Dodson2017-09-061-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5306 from mgugino-upstream-stage/fix-master-systemd-unitsOpenShift Bot2017-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Fix: set openshift_master_config_dir to the correct value.Michael Gugino2017-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous commit set 'openshift_master_config_dir' to '/var/lib/origin' if undefined during upgrades. This commit sets value to the proper directory '/etc/origin'
* | | | | | | | | | | | Merge pull request #4509 from zgalor/prometheus-roleScott Dodson2017-09-0621-1/+1058
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Create ansible role for deploying prometheus on openshift
| * | | | | | | | | | | | Create ansible role for deploying prometheus on openshiftZohar Galor2017-09-0621-1/+1058
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new role for installing prometheus on openshift. Depends on `openshift_hosted_prometheus_deploy` flag role creates: - prometheus namespace - prometheus clusterrolebinding and service account - pvs for prometheus, alertmanager and alertbuffer for internal nfs - prometheus pod with prometheus behind oauth-proxy, alertmanager and alert-buffer behind oauth-proxy - prometheus and alertmanager configmaps - prometheus and alerts services and direct routes - prometheus, alertmanager and alert-buffer pvcs
* | | | | | | | | | | | Merge pull request #5102 from ilackarms/fix-pv-templateScott Dodson2017-09-062-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | only evaluate openshift_cfme_nfs_server if using nfs
| * | | | | | | | | | | skip openshift_cfme_nfs_server if not using nfsScott Weiss2017-09-032-3/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5277 from ingvagabund/update-env-in-etcd-confScott Dodson2017-09-061-3/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | update env in etcd.conf.j2 to reflect the latest naming
| * | | | | | | | | | | | update env in etcd.conf.j2 to reflect the latest namingJan Chaloupka2017-08-311-3/+23
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5307 from sdodson/bump_ansible_23Scott Dodson2017-09-063-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump ansible requirement to 2.3
| * | | | | | | | | | | | | Bump ansible requirement to 2.3Scott Dodson2017-09-053-3/+3
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3536 from giuseppe/system-containers-skopeoOpenShift Bot2017-09-052-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | | oc_atomic_container: support Skopeo outputGiuseppe Scrivano2017-03-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we are working on using Skopeo to copy images to the OSTree storage. The output from atomic will be slightly different. Support also the new version. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.125.0].Jenkins CD Merge Bot2017-09-052-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.124.0].Jenkins CD Merge Bot2017-09-052-2/+26
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | Merge pull request #5300 from mtnbikenc/fix-ansible_syntax-checkScott Dodson2017-09-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | Fix ansible_syntax check
| * | | | | | | | | | Fix ansible_syntax checkRussell Teague2017-09-051-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5279 from kwoodson/repos_accept_name_or_idKenny Woodson2017-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Adding another default to protect against missing name/desc
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:38:27 +0000