summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6992 from ewolinetz/expand_readme_control_reqsOpenShift Merge Robot2018-02-021-0/+10
|\ | | | | | | | | | | | | | | Automatic merge from submit-queue. Adding requirements for logging and metrics To address https://github.com/openshift/openshift-ansible/issues/5293
| * Adding requirements for logging and metricsEric Wolinetz2018-02-011-0/+10
| |
* | Merge pull request #6995 from vrutkovs/f27-omitOpenShift Merge Robot2018-02-021-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Don't use 'omit' for package module 'name' param is required and can't be skipped. 'when' is used instead Fixes #6968
| * | Don't use 'omit' for package moduleVadim Rutkovsky2018-02-021-1/+2
| | | | | | | | | | | | 'name' param is required and can't be skipped. 'when' is used instead
* | | Merge pull request #6958 from vrutkovs/rework-full-upgradeOpenShift Merge Robot2018-02-023-56/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Upgrade playbook improvements Two changes in this PR: * Avoid duplication in upgrade.yml - it now would simply run upgrade_control_plane and upgrade_nodes playbooks * Restart controllers instead of start/stop if restart mode is 'services' * For 'system' restart mode controllers are disabled before master upgrade and re-enabled after upgrades are finished
| * | | Disable master controllers before upgrade and re-enable those when restart ↵Vadim Rutkovsky2018-01-312-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | mode is system This removes a start/stop after control plane upgrade
| * | | upgrade: run upgrade_control_plane and upgrade_nodes playbooks during full ↵Vadim Rutkovsky2018-01-311-50/+2
| | | | | | | | | | | | | | | | upgrade
* | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.36.0].Justin Pierce2018-02-022-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #6997 from sdodson/fix-missing-tasksScott Dodson2018-02-021-0/+4
|\ \ \ \ | | | | | | | | | | Add missing tasks file
| * | | | Add missing tasks fileScott Dodson2018-02-021-0/+4
| | | | | | | | | | | | | | | | | | | | Was errantly removed in 4f7d963986a1e28ecc6abd15532b0c1aece99be1
* | | | | Merge pull request #6976 from kwoodson/bz1538581OpenShift Merge Robot2018-02-022-5/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Adding defaults for the gcp variables to fix an undefined ansible exception. Fix for bz: https://bugzilla.redhat.com/show_bug.cgi?id=1538581 Default variables for gcp. Check to ensure defaults are set to something other than '' to ensure this works.
| * | | | | Adding defaults for the gcp variables to fix an undefined ansible exception.Kenny Woodson2018-02-012-5/+17
| | | | | |
* | | | | | Merge pull request #6960 from ewolinetz/metrics_pvc_idempotenceScott Dodson2018-02-022-32/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Conditionally create pvcs for metrics depending on whether or not it …
| * | | | | | Conditionally create pvcs for metrics depending on whether or not it already ↵Eric Wolinetz2018-01-312-32/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | exists
* | | | | | | Merge pull request #6851 from kwoodson/upgrade_dns_pushOpenShift Merge Robot2018-02-026-12/+43
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Upgrade to migrate to using push to DNS for registries. This is the beginning of the migration to push to docker-registry by DNS. This migrates users by rerolling their certificates and then redeploying the registry so that hosts can push to the registries with the newly created certificates.
| * | | | | | Upgrade to migrate to using push to DNS for registries.Kenny Woodson2018-02-016-12/+43
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6949 from vrutkovs/schedulable-mastersOpenShift Merge Robot2018-02-029-15/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Make masters schedulable by default Fixes #6930
| * | | | | Update hosts examples with a note about scheduling on mastersVadim Rutkovsky2018-01-317-9/+13
| | | | | |
| * | | | | Make master schedulableVadim Rutkovsky2018-01-312-6/+2
| | | | | |
* | | | | | Merge pull request #6855 from sdodson/bz1537726-masterScott Dodson2018-02-012-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't restart docker when re-deploying node certificates
| * | | | | | Don't restart docker when re-deploying node certificatesScott Dodson2018-01-242-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537726
* | | | | | | Merge pull request #6903 from jcantrill/1537857_fix_logging_prometheusScott Dodson2018-02-013-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | bug 1537857. Fix retrieving prometheus metrics
| * | | | | | | bug 1537857. Fix retrieving prometheus metricsJeff Cantrill2018-01-263-0/+16
| | | | | | | |
* | | | | | | | Merge pull request #6959 from kwoodson/file_write_fixKenny Woodson2018-02-0130-30/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixing file write issue.
| * | | | | | | | Fixing file write issue.Kenny Woodson2018-01-3130-30/+30
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #6972 from vrutkovs/hosts-external-lb-publicScott Dodson2018-02-011-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | hosts.example: clarify usage of openshift_master_cluster_public_hostname
| * | | | | | | | hosts.example: clarify usage of openshift_master_cluster_public_hostnameVadim Rutkovsky2018-02-011-1/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #6982 from smarterclayton/packageScott Dodson2018-02-013-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add python2-crypto package to images
| * | | | | | | | | Add python2-crypto packageClayton Coleman2018-02-013-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6991 from sdodson/vsphere-defaultsScott Dodson2018-02-011-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix vsphere sanitation
| * | | | | | | | | Fix vsphere sanitizationScott Dodson2018-02-011-7/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6989 from sdodson/vsphere-defaultsScott Dodson2018-02-012-0/+17
|\| | | | | | | | | | |_|_|_|_|_|/ / / |/| | | | | | | | Set a default for required vsphere variable
| * | | | | | | | Set a default for required vsphere variableScott Dodson2018-02-012-0/+17
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Check for required variables in sanitize inventory
* | | | | | | | Merge pull request #6955 from vrutkovs/upgrade-regex-version-matchOpenShift Merge Robot2018-02-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. upgrades: use openshift_version as a regexp when checking openshift.common.version This would fix errors like 'Master running 3.9.0 must be upgraded to 3.9* before node upgrade can be run' during the upgrade Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
| * | | | | | | | upgrades: use openshift_version as a regexp when checking ↵Vadim Rutkovsky2018-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift.common.version This would fix errors like 'Master running 3.9.0 must be upgraded to 3.9* before node upgrade can be run' during the upgrade Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | | | | | Merge pull request #6876 from mgugino-upstream-stage/fix-restart-master-playScott Dodson2018-02-019-33/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Remove master_ha bool checks
| * | | | | | | | Remove master_ha bool checksMichael Gugino2018-01-259-33/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these checks are no longer applicable to the tasks on which they are applied. This commit removes incorrect ha checks to ensure services are restarted at appropriate times. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500897
* | | | | | | | | Merge pull request #6944 from mtnbikenc/fix-1540108Scott Dodson2018-02-011-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | [1540108] Ignore openshift_pkg_version during 3.8 upgrade
| * | | | | | | | Ignore openshift_pkg_version during 3.8 upgradeRussell Teague2018-01-301-0/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.8 is an intermediate step when upgrading to 3.9 and openshift_pkg_version may be set in the inventory for 3.9. This will ensure there is not a conflict between the intermediate step and the final version requested. Bug 1540108 https://bugzilla.redhat.com/show_bug.cgi?id=1540108
* | | | | | | | Merge pull request #6947 from abutcher/openshift_aws_elb_cert_arnOpenShift Merge Robot2018-01-311-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Re-add openshift_aws_elb_cert_arn. This got removed in https://github.com/openshift/openshift-ansible/pull/6889 which breaks functionality for us.
| * | | | | | | | Re-add openshift_aws_elb_cert_arn.Andrew Butcher2018-01-301-1/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #6952 from sdodson/bz1540462OpenShift Merge Robot2018-01-317-20/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Don't update master-config.yaml with logging/metrics urls >= 3.9 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540462 I thought about refactoring things just to move the assetConfig vs ConfigMap update into update_master_config but the tasks get called on different hosts via plays.
| * | | | | | | | | Only perform console configmap ops when >= 3.9Scott Dodson2018-01-314-4/+12
| | | | | | | | | |
| * | | | | | | | | Remove playbooks/adhoc/openshift_hosted_logging_efk.yamlScott Dodson2018-01-311-18/+0
| | | | | | | | | |
| * | | | | | | | | Don't update master-config.yaml with logging/metrics urls >= 3.9Scott Dodson2018-01-313-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6732 from dav1x/vsphere-stgOpenShift Merge Robot2018-01-312-1/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. vsphere storage default add - redo on PR squashing commits vsphere storage default add - redo on PR squashing commits
| * | | | | | | | | | vsphere storage default addDavis Phillips2018-01-152-1/+9
| | | | | | | | | | |
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.35.0].Justin Pierce2018-01-312-2/+22
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | Merge pull request #6906 from jcantrill/kibana_env_varsOpenShift Merge Robot2018-01-314-0/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. allow setting of kibana env vars This PR allows setting kibana env vars via ansible in support of being able to adjust kibana config via env vars
| * | | | | | | | | | allow setting of kibana env varsJeff Cantrill2018-01-264-0/+9
| | | | | | | | | | |