summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6922 from mjudeikis/glusterfs-block-storageOpenShift Merge Robot2018-01-3112-53/+199
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Glusterfs block storage ansible support GlusterBlock support in our ansible for glusterfs role TODO: - [ ] checking if only one SC is set default - [ ] validate if mpath on nodes is configured - [ ] add check for rhel vs atomic - [x] make sure rpcbind is running and enabled BEFORE we even start glusterfs pods - [x] enable mpath - [ ] validate kernel module availability @ckyriakidou @jarrpa
| * | | | | | | | | | add glusterblock support for ansibleMangirdas2018-01-3112-53/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Christina Kyriakidou <Ckyriaki@Redhat.com>
* | | | | | | | | | | Merge pull request #6831 from jmencak/heatstack-infra-1936OpenShift Merge Robot2018-01-311-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix: e2e tests failing due to :1936/metrics unaccessible. This PR allows access to tcp/1936 ingress infra-secgrp policy, so that e2e test do not fail looking for router metrics (:1936/metrics).
| * | | | | | | | | | | Fix: e2e tests failing due to :1936/metrics unaccessible.Jiri Mencak2018-01-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR allows access to tcp/1936 ingress infra-secgrp policy, so that e2e test do not fail looking for router metrics port :1936/metrics
* | | | | | | | | | | | Merge pull request #6895 from ewolinetz/logging_preserve_volume_typeOpenShift Merge Robot2018-01-311-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Preserving ES dc storage type unless overridden by inventory variable Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1496758 where we weren't preserving hostPath for already deployed ES instances.
| * | | | | | | | | | | | No longer compare with legacy hosted varEric Wolinetz2018-01-261-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Preserving ES dc storage type unless overridden by inventory variableEric Wolinetz2018-01-261-7/+16
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6908 from tzumainn/fix-cinder-mountOpenShift Merge Robot2018-01-314-11/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. add cinder mountpoint to inventory Although the heat templates specify /dev/sdb as a mountpoint for cinder volumes, openstack does not always respect that setting. This PR updates inventory.py to figure out the correct mountpoint from the openstack API; and passes that information into the docker-storage-setup.
| * | | | | | | | | | | | fix hostvars parameter nameTzu-Mainn Chen2018-01-292-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | remove mountpoint parameterTzu-Mainn Chen2018-01-291-1/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | flake cleanupTzu-Mainn Chen2018-01-291-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | code simplification and lint cleanupTzu-Mainn Chen2018-01-291-20/+31
| | | | | | | | | | | | |
| * | | | | | | | | | | | add cinder mountpoint to inventoryTzu-Mainn Chen2018-01-274-1/+25
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6868 from vrutkovs/prefix-provisioner-podOpenShift Merge Robot2018-01-312-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Rework provisioners vars to support different prefix/version for Origin/OSE Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1523534 Obsoletes https://github.com/openshift/openshift-ansible/pull/6396
| * | | | | | | | | | | | Rework provisioners vars to support different prefix/version for Origin/OSEVadim Rutkovsky2018-01-292-2/+13
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5651 from vareti/NuageEtcdCertsFixOpenShift Merge Robot2018-01-306-9/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. copy etcd client certificates for nuage openshift monitor Nuage OpenShift Monitor requires etcd client certificates to talk to etcd. This PR helps in copying the certificates to the node where monitor is running and configures the input parameters accordingly.