summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Correct 3.7 to 3.9 upgrade openshift_image_tagMichael Gugino2018-01-263-5/+29
| | | | | | | | | | | Due to complexities upgrading two versions at the same time, openshift_image_tag was being set incorrectly during control_plane upgrades. This commit ensures that openshift_image_tag is set correctly during this process. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
* Merge pull request #6821 from spadgett/remove-asset-configScott Dodson2018-01-268-43/+81
|\ | | | | Remove old assetConfig from master-config.yaml
| * Remove old assetConfig from master-config.yamlSamuel Padgett2018-01-257-43/+78
| | | | | | | | | | | | | | | | The `assetConfig` is no longer used now that the console is split into its own pod. - Remove `assetConfig` on upgrades to 3.9 - Stop writing logging and metrics URLs to assetConfig for 3.9
| * Don't emit assetConfig on 3.9Scott Dodson2018-01-251-0/+3
| |
* | Merge pull request #6880 from sosiouxme/20180115-docker-image-locationsOpenShift Merge Robot2018-01-262-13/+47
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. docker_image_availability: containerized image overrides Fix https://bugzilla.redhat.com/show_bug.cgi?id=1538806 and related issues by handling the various containerized image variables.
| * | docker_image_availability: containerized overridesLuke Meyer2018-01-252-13/+47
| |/ | | | | | | Respect container image name override variables.
* | Automatic commit of package [openshift-ansible] release [3.9.0-0.25.0].Jenkins CD Merge Bot2018-01-262-2/+23
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #6857 from mtnbikenc/fix-1537946OpenShift Merge Robot2018-01-251-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1537946] Correct conditional check for GlusterFS IPs Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537946
| * | [1537946] Correct conditional check for GlusterFS IPsRussell Teague2018-01-241-1/+2
| | |
* | | Merge pull request #6875 from bparees/syncOpenShift Merge Robot2018-01-2521-127/+746
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. sync imagestreams+templates from origin master for v3.9 fixes https://github.com/openshift/openshift-ansible/issues/6872
| * | | sync imagestreams+templates from origin master for v3.9Ben Parees2018-01-2521-127/+746
| | |/ | |/|
* | | Merge pull request #6859 from abutcher/bz1536217OpenShift Merge Robot2018-01-253-0/+99
|\ \ \ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1536217: Need to validate etcd serving certs before 3.9 upgrade
| * | | Redeploy etcd certificates during upgrade when etcd hostname not present in ↵Andrew Butcher2018-01-243-0/+99
| | | | | | | | | | | | | | | | etcd serving cert SAN.
* | | | Merge pull request #6878 from mtnbikenc/fix-1502838OpenShift Merge Robot2018-01-251-3/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1502838] Correct certificate alt name parsing Certificates may have alternate names specified, which may contain different name types. Only 'DNS' alternate types should be parsed. X509v3 Subject Alternative Name: email:hostmaster@example.com, DNS:host.example.com Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1502838
| * | | [1502838] Correct certificate alt name parsingRussell Teague2018-01-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certificates may have alternate names specified, which may contain different name types. Only 'DNS' alternate types should be parsed. X509v3 Subject Alternative Name: email:hostmaster@example.com, DNS:host.example.com Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1502838
* | | | Merge pull request #6865 from giuseppe/node-specify-bind-optionScott Dodson2018-01-251-0/+1
|\ \ \ \ | |/ / / |/| | | node: specify bind option to /root/.docker
| * | | node: specify bind option to /root/.dockerGiuseppe Scrivano2018-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the option, runc fails with "no such device" when trying to create the mount point. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1534933 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #6858 from mtnbikenc/fix-1530403Scott Dodson2018-01-251-1/+5
|\ \ \ \ | | | | | | | | | | [1530403] Improve etcd group error message
| * | | | [1530403] Improve etcd group error messageRussell Teague2018-01-241-1/+5
| | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1530403
* | | | | Merge pull request #6734 from ewolinetz/logging_red_restart_checkScott Dodson2018-01-253-71/+97
|\ \ \ \ \ | |_|/ / / |/| | | | Only automatically restart if cluster is in yellow or green state
| * | | | Only automatically restart if cluster is in yellow or green stateEric Wolinetz2018-01-243-71/+97
| | |/ / | |/| |
* | | | Merge pull request #6841 from sdodson/bz1491100OpenShift Merge Robot2018-01-251-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Set a default for openshift_hosted_registry_storage_azure_blob_realm Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1491100
| * | | | Set a default for openshift_hosted_registry_storage_azure_blob_realmScott Dodson2018-01-231-0/+2
| |/ / /
* | | | Merge pull request #6849 from vrutkovs/label-masters-with-upstream-standardOpenShift Merge Robot2018-01-255-42/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Label masters with node-role.kubernetes.io/master This is controlled by `openshift_master_node_label` var in openshift_manage_node Related to https://bugzilla.redhat.com/show_bug.cgi?id=1535673
| * | | | openshift_manage_node: Label nodes in one passVadim Rutkovsky2018-01-241-14/+6
| | | | |
| * | | | Label masters with node-role.kubernetes.io/master. This PR also sets these ↵Vadim Rutkovsky2018-01-245-42/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | labels and scheduling status during upgrades Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | Merge pull request #6626 from pgier/prometheus-remove-tsdb-block-configOpenShift Merge Robot2018-01-242-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. openshift_prometheus: remove block duration settings The prometheus block duration settings should not be changed from their defaults. See also: https://github.com/prometheus/prometheus/pull/3618
| * | | | | openshift_prometheus: remove block duration settingsPaul Gier2018-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prometheus block duration settings should not be changed from their defaults. See also: https://github.com/prometheus/prometheus/pull/3618
* | | | | | Merge pull request #6848 from mgugino-upstream-stage/remove-fact-labelsOpenShift Merge Robot2018-01-241-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove unused node.lables from openshift_facts
| * | | | | | Remove unused node.lables from openshift_factsMichael Gugino2018-01-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing dead code.
* | | | | | | Merge pull request #6551 from mgugino-upstream-stage/swapoffScott Dodson2018-01-244-62/+148
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Create swapoff module
| * | | | | | | Create swapoff moduleMichael Gugino2018-01-244-62/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create custome ansible module 'swapoff' to idempotently disable swap in /etc/fstab and also run swapoff.
* | | | | | | | Merge pull request #6843 from rajatchopra/bugdnsmasqScott Dodson2018-01-242-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change dnsmasq Requires to Wants
| * | | | | | | | Change dnsmasq Requires to Wants. ↵Rajat Chopra2018-01-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1532960 Signed-off-by: Rajat Chopra <rchopra@redhat.com>
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.24.0].Jenkins CD Merge Bot2018-01-242-2/+46
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6842 from ↵Scott Dodson2018-01-249-1/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/protect-upgrade-master-version Protect master installed version during node upgrades
| * | | | | | | | Protect master installed version during node upgradesMichael Gugino2018-01-239-1/+10
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master version is unprotected during all upgrades. During node-only upgrades, master version should remain protected to ensure correct image tag is set for node upgrades. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
* | | | | | | | Merge pull request #6819 from fabianvf/1524805-service-catalog-pull-policyOpenShift Merge Robot2018-01-242-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1524805- ServiceCatalog now works disconnected Change imagePullPolicy for service catalog from Always to IfNotPresent, allowing service catalog to install in a disconnected setting https://bugzilla.redhat.com/show_bug.cgi?id=1524805
| * | | | | | | | Bug 1524805- ServiceCatalog now works disconnectedFabian von Feilitzsch2018-01-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change imagePullPolicy for service catalog from Always to IfNotPresent, allowing service catalog to install in a disconnected setting
* | | | | | | | | Merge pull request #6825 from vrutkovs/nfs-storage-quotesOpenShift Merge Robot2018-01-241-8/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. NFS Storage: make sure openshift_hosted_*_storage_nfs_directory are quoted This enables using non-standard symbols (e.g. spaces) in the path Fixes #6824
| * | | | | | | | | NFS Storage: make sure openshift_hosted_*_storage_nfs_directory are quotedVadim Rutkovsky2018-01-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables using non-standard symbols (e.g. spaces) in the path Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | | | | | | Merge pull request #6830 from bparees/registry_addrOpenShift Merge Robot2018-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registry hostname
| * | | | | | | | | use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the ↵Ben Parees2018-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registry hostname bug 1537593 https://bugzilla.redhat.com/show_bug.cgi?id=1537593
* | | | | | | | | | Merge pull request #6603 from joelddiaz/fetch_subnet_azOpenShift Merge Robot2018-01-243-3/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. un-hardcode default subnet az allow defining 'default_az' for one of the subnets in the vpc structure, and pull that default_az and set it to openshift_aws_subnet_az. this should allow one less variable to be defined/overridded when using non-default (us-east-1) regions
| * | | | | | | | | un-hardcode default subnet azJoel Diaz2018-01-223-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow defining 'default_az' for one of the subnets in the vpc structure, and pull that default_az and set it to openshift_aws_subnet_az. this should allow one less variable to have to be defined/overridded (openshift_aws_subnet_az) when using non-default (us-east-1) regions update provisioning_vars.yml.example to show an example VPC structure
* | | | | | | | | | Merge pull request #6786 from simaishi/cf_46_betaOpenShift Merge Robot2018-01-2424-931/+4727
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. CF 4.6 Beta templates for OpenShift v3.7 and v3.9 cc @sdodson @Loicavenel
| * | | | | | | | | | Update CF 4.6 Beta templates in openshift_management directorySatoe Imaishi2018-01-244-29/+415
| | | | | | | | | | |
| * | | | | | | | | | Add templates to v3.9Satoe Imaishi2018-01-1910-451/+2156
| | | | | | | | | | |
| * | | | | | | | | | Use Beta repo pathSatoe Imaishi2018-01-184-13/+13
| | | | | | | | | | |
| * | | | | | | | | | CF 4.6 templatesSatoe Imaishi2018-01-1810-451/+2156
| | | | | | | | | | |