summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5356 from ↵OpenShift Bot2017-09-113-10/+14
|\ | | | | | | | | ashcrow/openshift-docker-systemcontainer-image-override Merged by openshift-bot
| * container-engine: Allow full image overrideSteve Milner2017-09-113-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | openshift_docker_systemcontainer_image_registry_override has been replaced with openshift_docker_systemcontainer_image_override. The difference is openshift_docker_systemcontainer_image_override takes a full image path including the tag. Example: openshift_docker_systemcontainer_image_override=gscrivano/container-engine:latest Signed-off-by: Steve Milner <smilner@redhat.com>
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.126.0].Jenkins CD Merge Bot2017-09-112-2/+13
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #5340 from sdodson/bz1489913Scott Dodson2017-09-111-3/+4
|\ \ | | | | | | Revert back to hostnamectl and previous default of not setting hostname
| * | Revert back to hostnamectl and previous default of not setting hostnameScott Dodson2017-09-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The old default was "{{ not openshift.common.version_gte_3_1_or_1_1 }}" just default to false instead, master branch will never be used with 3.0 hostname module doesn't work on atomic host Fixes BZ 1489913
* | | Merge pull request #5344 from mgugino-upstream-stage/fix-pkg-versionsOpenShift Bot2017-09-111-0/+5
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Fix rpm version logic for hostsMichael Gugino2017-09-081-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the variable openshift_pkg_version is defined by the first master unless specified by the user. The role openshift_version attempts to set this value on all other hosts after setting it on the first master. During normal installation, openshift_pkg_version is not initially defined, therefor each host will utilize the most recent rpm available. This creates a problem during later operations of a cluster if a node is added or replaced by a new node. This commit ensures that the value for openshift_pkg_version set by the first master is respected by subsequent hosts. Fixes: #5341
* | | Merge pull request #5256 from ashcrow/1451023Scott Dodson2017-09-113-0/+19
|\ \ \ | | | | | | | | upgrade: Verify required network items are set
| * | | inventory: Denote new required upgrade variablesSteve Milner2017-09-082-0/+4
| | | |
| * | | upgrade: Verify required network items are setSteve Milner2017-09-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When upgrading osm_cluster_network_cidr, osm_host_subnet_length, and openshift_portal_net must be set to avoid SDN initialization errors. This was found when the default parameters were changed between Openshift versions. This meant users who upgraded and did not specify either mentioned variable at install/upgrade time ended up getting SDN errors post upgrade. When osm_cluster_network_cidr, osm_host_subnet_length, and openshift_portal_net are not set the upgrade will fail telling the user that the variables must be set and how to find the current values in the current install. References: https://github.com/openshift/openshift-ansible/commit/b50b4ea0b03feb9431abd7294fe4fb6b549ddfc0 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1451023
* | | | Merge pull request #5342 from mtnbikenc/fix-include-through-symlinkScott Dodson2017-09-111-1/+1
|\ \ \ \ | | | | | | | | | | Correct include path to not follow symlink
| * | | | Correct include path to not follow symlinkRussell Teague2017-09-081-1/+1
| | |/ / | |/| |
* | | | Merge pull request #5332 from kwoodson/amibuild_node_configOpenShift Bot2017-09-114-9/+12
|\ \ \ \ | |_|_|/ |/| | | Merged by openshift-bot
| * | | ami build process calls openshift-node/config.ymlKenny Woodson2017-09-074-9/+12
| | | |
* | | | Merge pull request #5338 from mtnbikenc/fix-pre_upgradeOpenShift Bot2017-09-112-1/+5
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fix issue with etcd_common when using pre_upgrade tagRussell Teague2017-09-082-1/+5
| | | | |
* | | | | Merge pull request #5339 from mtnbikenc/fix-upgrade-pathOpenShift Bot2017-09-091-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | Fix include path for docker upgrade tasksRussell Teague2017-09-081-2/+4
| |/ / /
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.125.1].Scott Dodson2017-09-082-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --use-version 3.7.0 --use-release 0.125.1%{?dist}
* | | | Merge pull request #5289 from jcantrill/1487573_fix_allowed_es_versionOpenShift Bot2017-09-085-10/+10
|\ \ \ \ | |/ / / |/| | | Merged by openshift-bot
| * | | bug 1487573. Bump the allowed ES versionsJeff Cantrill2017-09-015-10/+10
| | | |
* | | | 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>