summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6975 from pgier/bz1540799OpenShift Merge Robot2018-02-062-2/+2
|\ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. bug 1540799: openshift_prometheus: update alertmanager config file flag Prometheus alertmanager as of 0.13.0 requires double dashes (posix) for command line flags. The double dashes should be backwards compat with earlier versions of alertmanager.
| * bug 1540799: openshift_prometheus: update alertmanager config file flagPaul Gier2018-02-052-2/+2
| | | | | | | | | | | | Prometheus alertmanager as of 0.13.0 requires double dashes (posix) for command line flags. The double dashes should be backwards compat with earlier versions of alertmanager.
* | Merge pull request #7016 from kwoodson/daemonset_monitoringOpenShift Merge Robot2018-02-063-18/+34
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. daemonset config modifications to allow monitoring. Modifications that allow custom secrets, configmaps, and shared setup between containers for config and monitoring.
| * | Updates to configure monitoring container.Kenny Woodson2018-02-053-18/+34
| | |
* | | Merge pull request #6933 from giuseppe/bz-1529478Scott Dodson2018-02-051-3/+3
|\ \ \ | |_|/ |/| | cri-o: export variables defined in crio-network
| * | cri-o: export variables defined in crio-networkGiuseppe Scrivano2018-01-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | so that the cri-o process can use them. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1529478 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #6731 from Klaas-/klaas-patch1OpenShift Merge Robot2018-02-051-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Automatic merge from submit-queue. Fix broken softlink I think d3fefc32a727fe3c13159c4e9fe4399f35b487a8 moved dirs and failed to correct the symlinks inside
| * | Fix softlinks broken by d3fefc32a727fe3c13159c4e9fe4399f35b487a8Klaas Demter2018-01-261-1/+1
| | |
* | | Merge pull request #6985 from joelddiaz/deprovision_s3_bucketsKenny Woodson2018-02-052-0/+31
|\ \ \ | | | | | | | | add S3 bucket cleanup
| * | | add S3 bucket cleanupJoel Diaz2018-02-022-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Default to just cleaning out all the objects in the S3 bucket (IFF openshift_aws_create_s3 is 'true'). If you really, trully want to delete the S3 bucket and free up the bucket name, you can set openshift_aws_really_delete_s3_bucket to 'true' ('false' by default).
* | | | Merge pull request #6969 from mjudeikis/gluster-dynamic-invetory-bugOpenShift Merge Robot2018-02-042-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. dynamic inventory bug when group exists but its empty @jarrpa output from my test for the gluster block I use dynamic inventory. And the result of this is that ansible see all possible groups available, but some of them are empty [1]. Because group exists, fist condition is evaluated as true and it fails with the array is an empty error... ``` ... 'all': [u'54.144.5.175', u'52.200.175.54', u'54.237.208.252', u'52.55.224.72', u'52.207.103.246', u'34.227.95.191', u'34.238.127.160'], u'bastion': [u'34.227.95.191'], u'bastion.0': [u'34.227.95.191'], u'etcd': [u'34.238.127.160'], u'glusterfs': [u'52.200.175.54', u'52.207.103.246', u'54.144.5.175'], u'glusterfs.0': [u'52.200.175.54'], u'glusterfs.1': [u'52.207.103.246'], u'glusterfs.2': [u'54.144.5.175'], u'glusterfs_registry': [], u'infra': [u'52.55.224.72'], u'infra.0': [u'52.55.224.72'], u'masters': [u'34.238.127.160'], u'masters.0': [u'34.238.127.160'], ... ```
| * | | | dynamic inventory bug when group exists but its emptyMangirdas2018-02-022-2/+2
| | | | |
* | | | | Merge pull request #6980 from mtnbikenc/fix-upgradesScott Dodson2018-02-043-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix version handling in 3.8/3.9 control plane upgrades
| * | | | | Fix version handling in 3.8/3.9 control plane upgradesRussell Teague2018-02-023-2/+4
| | | | | |
* | | | | | Merge pull request #6996 from mjudeikis/restart_fix_atomicOpenShift Merge Robot2018-02-032-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. check for restart on atomic fix atomic host storage
| * | | | | | dynamic inventory bug when group exists but its emptyMangirdas2018-02-022-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6988 from chaitanyaenr/allow_rootOpenShift Merge Robot2018-02-022-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Parameterize user and disable_root options in cloud config This commit will allow the user to login as root. By default the user is set to openshift and disable_root is set to true.
| * | | | | | Parameterize user and disable_root options in cloud configNaga Ravi Chaitanya Elluri2018-02-012-2/+7
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | This commit will allow the user to login as root. By default, the user is set to openshift and disable_root is set to true.
* | | | | | 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-023-12/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-013-12/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6949 from vrutkovs/schedulable-mastersOpenShift Merge Robot2018-02-022-6/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Make masters schedulable by default Fixes #6930
| * | | | | | Make master schedulableVadim Rutkovsky2018-01-312-6/+2
| | | | | | |
* | | | | | | 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
| | | | | | | | |
* | | | | | | | | Fix vsphere sanitizationScott Dodson2018-02-011-7/+7
| | | | | | | | |
* | | | | | | | | Set a default for required vsphere variableScott Dodson2018-02-012-0/+17
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Check for required variables in sanitize inventory
* | | | | | | | Merge pull request #6876 from mgugino-upstream-stage/fix-restart-master-playScott Dodson2018-02-013-17/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Remove master_ha bool checks
| * | | | | | | Remove master_ha bool checksMichael Gugino2018-01-253-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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-314-4/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6732 from dav1x/vsphere-stgOpenShift Merge Robot2018-01-311-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-0/+6
| | | | | | | | | |
* | | | | | | | | | 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-313-1/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.