csa/devops/ansible-patches/openshift.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #7095 from jpeeler/upgrade-cat	OpenShift Merge Robot	2018-02-12	1	-0/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Add service catalog to be upgraded Currently service catalog was left running at the previous version. https://bugzilla.redhat.com/show_bug.cgi?id=1541247
\| *	Add service catalog to be upgraded	Jeff Peeler	2018-02-12	1	-0/+7
\| \| \| \| \| \| \| \|	Currently service catalog was left running at the previous version.
* \|	Merge pull request #7119 from vrutkovs/etcd-scaleup-ansible-name	OpenShift Merge Robot	2018-02-12	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. etcd_scaleup: use inventory_hostname when etcd ca host is being picked This would fix etcd scaleup playbook when inventory uses custom hostnames, e.g.: ``` new_etcd: hosts: new-etcd-node: ansible_host: ec2-54-173-186-97.compute-1.amazonaws.com ```
\| * \|	etcd_scaleup: use inventory_hostname when etcd ca host is being picked	Vadim Rutkovsky	2018-02-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* \| \|	Merge pull request #7113 from mgugino-upstream-stage/fix-etcd-scaleup-sanity	Michael Gugino	2018-02-12	2	-1/+19
\|\ \ \ \| \| \| \| \| \| \| \|	Fix etcd scaleup plays
\| * \| \|	Fix etcd scaleup plays	Michael Gugino	2018-02-12	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit ensures that only the proper host groups have sanity checks run during etcd scaleup. This commit also adds additional debugging statements to sanity_checks.py to make it easier to debug when an error occurs. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1543771
* \| \| \|	Merge pull request #7108 from spadgett/check-version-for-console-install	OpenShift Merge Robot	2018-02-12	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Disable console install when not 3.9 or newer Fixes https://github.com/openshift/origin/issues/18573 /assign @sdodson @smarterclayton @stevekuznetsov
\| * \| \| \|	Disable console install when not 3.9 or newer	Samuel Padgett	2018-02-12	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #7103 from vrutkovs/origin-dns-prepend-cluster-local	OpenShift Merge Robot	2018-02-12	1	-2/+3
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. origin-dns: make sure cluster.local DNS server is listed first This would ensure glibc resolver won't discard this server when existing DNS server list is longer than 2. This sed would also update existing configuration, where cluster.local was appended Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1544001
\| * \| \| \|	origin-dns: make sure cluster.local DNS server is listed first	Vadim Rutkovsky	2018-02-12	1	-2/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would ensure glibc resolver won't discard this server when existing DNS server list is longer than 2. This sed would also update existing configuration, where cluster.local was appended
* \| \| \|	Merge pull request #7107 from csrwng/cluster_operator_components	OpenShift Merge Robot	2018-02-12	1	-0/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Add playbook to install components for cluster operator Adds a playbook to install infra components for cluster operator
\| * \| \| \|	Add playbook to install components for cluster operator	Cesar Wong	2018-02-12	1	-0/+24
\| \| \| \| \|
* \| \| \| \|	Merge pull request #7083 from SaravanaStorageNetwork/fix_templates	OpenShift Merge Robot	2018-02-12	9	-20/+370
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Backport changes for glusterfs and heketi template Backport changes for glusterfs and heketi template To avoid unknown parameter errors like GB_GLFS_LRU_COUNT and HEKETI_FSTAB Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
\| * \| \| \| \|	Backport changes for glusterfs, heketi, s3 and block templates	Saravanakumar Arumugam	2018-02-12	9	-20/+370
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
* \| \| \| \| \|	Merge pull request #6476 from jihoon5/jihoon5	Michael Gugino	2018-02-12	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support master node high availability
\| * \| \| \| \| \|	Support master node high availability	jihoon.o	2017-12-14	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6699 from bogdando/heat_user_data	OpenShift Merge Robot	2018-02-12	3	-0/+50
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. [openstack] custom user commands for cloud-init Allow to specify additional user commands executed on all Nova servers provisioned via Heat. An example use case is installing and starting os-collect-config agents to put Nova servers under the configuration management driven via the host openstack cloud Heat services. This allows to integrate with another deployment tools like TripleO. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
\| * \| \| \| \| \| \|	Fix openshift_openstack_provision_user_commands	Bogdan Dobrelya	2018-02-12	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
\| * \| \| \| \| \| \|	Fix wording	Bogdan Dobrelya	2018-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
\| * \| \| \| \| \| \|	Fix cloud init runcmd templating	Bogdan Dobrelya	2018-02-09	2	-8/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
\| * \| \| \| \| \| \|	Note ignored Heat user data changes for openstack	Bogdan Dobrelya	2018-02-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
\| * \| \| \| \| \| \|	Clarify the ansible playbook vs cloud-init	Bogdan Dobrelya	2018-02-09	2	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document use cases for custom post-provision ansible hooks vs cloud-init runcmd shell commands. Rename to openshift_openstack_cloud_init_runcmd. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
\| * \| \| \| \| \| \|	Fix openstack cloud-init runcmd templating	Bogdan Dobrelya	2018-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
\| * \| \| \| \| \| \|	[openstack] custom user commands for cloud-init	Bogdan Dobrelya	2018-02-09	3	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to specify additional user commands executed on all Nova servers provisioned via Heat. An example use case is installing and starting os-collect-config agents to put Nova servers under the configuration management driven via the host openstack cloud Heat services. This allows to integrate with another deployment tools like TripleO. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* \| \| \| \| \| \| \|	Merge pull request #7073 from abutcher/aws-node-hostname	OpenShift Merge Robot	2018-02-12	2	-8/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Update user-data for FQDN instance hostnames * Remove node service start from bootstrap.yml. We start and enable the node service in user-data and we want the node service to start after NetworkManager so that the instance will have its final hostname. * Restart systemd-hostnamed before restarting NetworkManager. In testing this has ensured that instances receive an FQDN hostname which is required for kube.
\| * \| \| \| \| \| \| \|	Remove node start from bootstrap.yml.	Andrew Butcher	2018-02-12	1	-8/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Restart systemd-hostnamed before restarting NetworkManager in node user-data.	Andrew Butcher	2018-02-12	1	-0/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7099 from vrutkovs/etcd-containerized-upgrade	OpenShift Merge Robot	2018-02-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Use r_etcd_common_etcdctl_command instead of hardcoded binary name to support containerized upgrade etcdctlv2 is used to check cluster health pre- and post-upgrade
\| * \| \| \| \| \| \| \| \|	Use r_etcd_common_etcdctl_command instead of hardcoded binary name to ↵	Vadim Rutkovsky	2018-02-10	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support containerized upgrade
* \| \| \| \| \| \| \| \|	Merge pull request #7022 from vrutkovs/sanitize-labels	OpenShift Merge Robot	2018-02-12	16	-330/+462
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Verify that requested services have schedulable nodes matching the selectors Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1538445 Not sure if I should keep one task per failure or should group them by service (e.g. all logging check in one tasks)
\| * \| \| \| \| \| \| \|	Fix indentation to make yamllint happy	Vadim Rutkovsky	2018-02-10	11	-330/+330
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
\| * \| \| \| \| \| \| \|	Verify that requested services have schedulable nodes matching the selectors	Vadim Rutkovsky	2018-02-10	15	-2/+134
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* \| \| \| \| \| \| \|	Merge pull request #7105 from vrutkovs/additional-mounts-example	Scott Dodson	2018-02-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	additional mounts: specify 'type' in container_runtime_crio_additional_mounts
\| * \| \| \| \| \| \|	additional mounts: specify 'type' in container_runtime_crio_additional_mounts	Vadim Rutkovsky	2018-02-12	1	-0/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #7001 from mbruzek/cidr_pool_start_end	OpenShift Merge Robot	2018-02-12	3	-19/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Removing prefix, replacing with cidr, pool_start and pool_end vars The heat template was hardcoded with a /24 cidr and that limited customers to 251 ip addresses in the OpenStack subnet. This allows the user to configure the cidr and the allocation pool start and end. Addresses issue #6829 that I created last week. @tomassedovic please take a look
\| * \| \| \| \| \|	Removing prefix and replacing with cidr, pool_start and pool_end variables.	Matt Bruzek	2018-02-02	3	-19/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7093 from sdodson/bz1534917	OpenShift Merge Robot	2018-02-09	3	-6/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Normalize the time we wait for pods to 5s * 60 retries A few people have run into situations where it takes longer than 120seconds for the webconsole to start up so lets be a bit more foregiving and allow for up to 5 minutes in scenarios where we're waiting for pods.
\| * \| \| \| \| \| \|	Normalize the time we wait for pods to 5s * 60 retries	Scott Dodson	2018-02-09	3	-6/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7078 from mgugino-upstream-stage/limit-hosts	OpenShift Merge Robot	2018-02-09	30	-7/+149
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Limit host scope during plays Many plays only target a select subset of hosts, especially oo_first_master for components such as logging and registry. This commit limits the scope of most plays to eliminate unnecessary task execution on node groups. This will result in great time savings for large deployments. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1516526
\| * \| \| \| \| \| \| \|	Limit host scope during plays	Michael Gugino	2018-02-09	30	-7/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many plays only target a select subset of hosts, especially oo_first_master for components such as logging and registry. This commit limits the scope of most plays to eliminate unnecessary task execution on node groups. This will result in great time savings for large deployments. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1516526
* \| \| \| \| \| \| \| \|	Merge pull request #7086 from spadgett/pause-for-console-deployment	OpenShift Merge Robot	2018-02-09	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Pause for console rollout /assign @sdodson
\| * \| \| \| \| \| \| \|	Pause for console rollout	Samuel Padgett	2018-02-09	1	-0/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7088 from mgugino-upstream-stage/fix-upgrade-cp	OpenShift Merge Robot	2018-02-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix upgrade-control plane post_control_plane.yml An entry-point playbook was imported by mistake. This caused common init code to run again, which is undesireable. This commit changes the import to use the corresponding 'private' play which does not call the init code. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542855
\| * \| \| \| \| \| \| \|	Fix upgrade-control plane post_control_plane.yml	Michael Gugino	2018-02-09	1	-1/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	An entry-point playbook was imported by mistake. This caused common init code to run again, which is undesireable. This commit changes the import to use the corresponding 'private' play which does not call the init code. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542855
* / \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.9.0-0.42.0].	Justin Pierce	2018-02-09	2	-2/+53
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \| \| \| \|	Merge pull request #7058 from kwoodson/crio_additional_mounts	Kenny Woodson	2018-02-09	2	-0/+12
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Adding ability to provide additional mounts to crio system container.
\| * \| \| \| \| \|	Adding ability to provide additional mounts to crio system container.	Kenny Woodson	2018-02-07	2	-0/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6712 from vrutkovs/avoid-hardcoding-image-version	OpenShift Merge Robot	2018-02-09	18	-23/+26
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Set default image to openshift_release Previously `v3.7` was hardcoded as a default value, instead `openshift_release` should be used. A new var is introduced - `openshift_template_service_broker_image_tag`, similar to vars for other services. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1530183 TODO: * [x] Make sure all images have a variable for image prefix * [x] Figure out if `latest` is a good default for origin images * [ ] Set correct `openshift_image_tag` in CI inventory for tests to pass
\| * \| \| \| \| \|	Set default image tag to openshift_image_tag for services	Vadim Rutkovsky	2018-02-08	18	-23/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* \| \| \| \| \| \|	Merge pull request #7077 from ewolinetz/logging_facts_sane_yaml_parse	OpenShift Merge Robot	2018-02-08	1	-3/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Only try to yaml.load a file if it ends in .yml or .yaml in logging facts Addresses error seen in https://bugzilla.redhat.com/show_bug.cgi?id=1543625 Also prevents us from seeing this when rerunning a deployment for es5.x branch. When we are trying to load a configmap file to parse it for facts based on the values, we should only parse if it is a yaml or yml file. Note: if someone created a configmap entry with key that matched that, but wasn't a yaml file, it would still fail... not sure if that can be helped.