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 #5806 from staebler/service_catalog_uninstall_issues	OpenShift Merge Robot	2017-10-24	7	-17/+47
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix a few small issues in service catalog uninstall * Service catalog install was not re-creating the apiserver.crt and apiserver.key files when generating certs. But the ca.crt and ca.key files were being re-created. This was causing non-verifiable certs to be used when service catalog was uninstalled and re-installed. The service catalog installer was changed to delete the apiserver.crt and apiserver.key files so that they are re-created using the new ca.crt and ca.key files. * The asb auth token secret was not being deleted correctly and causing the uninstaller to fail. * The asb uninstaller was attempting to delete the broker registration from the service catalog. However, the service catalog is uninstalled first. When the asb uninstaller would fail when attempting to delete the ClusterServiceBroker. The uninstaller was changed to verify that the servicecatalog APIService exists first before attempting to delete the ClusterServiceBroker. * The service catalog uninstaller was attempting to delete policybindings. The server does not have a resource type name policybinding. I do not know what the intention is there, but I have commented out that part of the uninstaller.
\| *	Remove extraneous spaces that yamllint dislikes	staebler	2017-10-23	1	-3/+3
\| \|
\| *	Remove role bindings during service catalog un-install	staebler	2017-10-22	5	-15/+28
\| \|
\| *	Fix a few small issues in service catalog uninstall	staebler	2017-10-22	3	-6/+23
\| \|
* \|	Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgrades	OpenShift Merge Robot	2017-10-24	3	-11/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Enable oreg_auth credential replace during upgrades Currently, upgrades run a docker image pull prior to upgrading masters and nodes for containerized installs. If using a secure registry, and a user wishes to upgrade their credentials due to expiry, the image pull will fail. This commit ensures docker login credentials are updated during upgrades, if necessary. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503995
\| * \|	Enable oreg_auth credential replace during upgrades	Michael Gugino	2017-10-19	3	-11/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, upgrades run a docker image pull prior to upgrading masters and nodes for containerized installs. If using a secure registry, and a user wishes to upgrade their credentials due to expiry, the image pull will fail. This commit ensures docker login credentials are updated during upgrades, if necessary. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503995
* \| \|	Merge pull request #5828 from mgugino-upstream-stage/fix-openid-challenge	Scott Dodson	2017-10-24	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Remove incorrect validation for OpenIDIdentityProvider
\| * \| \|	Remove incorrect validation for OpenIDIdentityProvider	Michael Gugino	2017-10-20	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, OpenIDIdentityProvider does not support 'challenge=true' in openshift-ansible. This is incorrect, the auth plugin OpenIDIdentityProvider does support this. This commit removes the unnecessary validation of challenge key. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1444367 Fixes: https://github.com/openshift/openshift-ansible/issues/4417
* \| \| \|	Merge pull request #5840 from staebler/service_catalog_role_patching	OpenShift Merge Robot	2017-10-24	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix edit and admin role patching for service catalog Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1496694. Update the jinja files used to patch the edit and admin ClusterRoles so that it uses the new resource names of ServiceInstances and ServiceBindings.
\| * \| \| \|	Fix edit and admin role patching for service catalog	staebler	2017-10-23	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5838 from ↵	Jan Chaloupka	2017-10-24	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ingvagabund/strip-dash-when-comparing-versions-python3 strip dash when comparing version with Python3
\| * \| \| \| \|	strip dash when comparing version with Python3	Jan Chaloupka	2017-10-23	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5796 from mgugino-upstream-stage/journald-masters-upgrades	OpenShift Merge Robot	2017-10-24	3	-22/+28
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Ensure upgrades apply latest journald settings Currently, existing clusters might not have journald configurations applied. This may result in a rate- limiting of important log messages on openshift-masters. This commit ensures that journald settings are applied during the upgrade process openshif-masters. Fixes: https://github.com/openshift/openshift-ansible/issues/5642
\| * \| \| \| \| \|	Ensure upgrades apply latest journald settings	Michael Gugino	2017-10-18	3	-22/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, existing clusters might not have journald configurations applied. This may result in a rate- limiting of important log messages on openshift-masters. This commit ensures that journald settings are applied during the upgrade process openshif-masters. Fixes: https://github.com/openshift/openshift-ansible/issues/5642
* \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.7.0-0.177.0].	Jenkins CD Merge Bot	2017-10-24	2	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \| \| \| \|	Merge pull request #5808 from zgalor/stateful_set	Scott Dodson	2017-10-23	4	-14/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch to stateful set in prometheus
\| * \| \| \| \| \| \|	Switch to stateful set in prometheus	Zohar Galor	2017-10-23	4	-14/+18
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update prometheus and alert-buffer image versions, and add prometheus, and oauth-proxy arguments to align with origin template
* \| \| \| \| \| \|	Merge pull request #5569 from ganhuang/all-hosts-no-proxy	Scott Dodson	2017-10-23	1	-1/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate internal hostnames of no_proxy
\| * \| \| \| \| \| \|	Generate all internal hostnames of no_proxy	Gan Huang	2017-10-19	1	-1/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5832 from sdodson/bz1504525	Scott Dodson	2017-10-23	2	-6/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct version gates on policy reconciliation and add retries
\| * \| \| \| \| \| \| \|	verstion_gte seems unreliable on containerized installs	Scott Dodson	2017-10-20	2	-6/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Retry reconcile in case of error and give up eventually	Simo Sorce	2017-10-20	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handles spurious failures and does not get mad if it just cannot do it. Signed-off-by: Simo Sorce <simo@redhat.com>
* \| \| \| \| \| \| \| \|	Merge pull request #5654 from vshn/mastersysconfigvar1	OpenShift Merge Robot	2017-10-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Avoid undefined variable in master sysconfig template When "openshift_master_controllers_env_vars" is set, but "openshift_master_api_env_vars" isn't, the template for the sysconfig file of atomic-openshift-master fails: AnsibleUndefinedVariable: 'dict object' has no attribute 'api_env_vars' Avoid this issue by applying "default({})" to the dict and always calling ".items()".
\| * \| \| \| \| \| \| \| \|	Avoid undefined variable in master sysconfig template	Michael Hanselmann	2017-10-19	1	-1/+1
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When "openshift_master_controllers_env_vars" is set, but "openshift_master_api_env_vars" isn't, the template for the sysconfig file of atomic-openshift-master fails: AnsibleUndefinedVariable: 'dict object' has no attribute 'api_env_vars' Avoid this issue by applying "default({})" to the dict and always calling ".items()".
* \| \| \| \| \| \| \| \|	Merge pull request #5781 from mgugino-upstream-stage/fix-reg-auth-templating	Scott Dodson	2017-10-23	3	-3/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure proper variable templating for skopeo auth credentials
\| * \| \| \| \| \| \| \| \|	Ensure proper variable templating for skopeo auth credentials	Michael Gugino	2017-10-17	3	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, docker_image_availability.py plugin check is using the raw strings for variables from task_vars. This results in any variables that utilized within the plugin to be un-templated. For instance, if variable "x" is set to "{{ y }}" and y is set to "2", one would expect that x == 2 inside the plugin. Currently, the plugin will use the string "{{ y }}" for the value of x instead of templating the variable. This commit ensures skopeo registry auth credentials are templated properly. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500698
* \| \| \| \| \| \| \| \| \|	Merge pull request #5811 from zgalor/add_nfs_to_readme	Scott Dodson	2017-10-23	1	-2/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add nfs variables documentation to README file
\| * \| \| \| \| \| \| \| \| \|	Add nfs variables documentation to README file	Zohar Galor	2017-10-19	1	-2/+25
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation of external nfs variables
* \| \| \| \| \| \| \| \| \|	Merge pull request #5845 from ingvagabund/check-correct-master-services	Scott Dodson	2017-10-23	1	-12/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check if the master service is non-ha or not
\| * \| \| \| \| \| \| \| \| \|	Check if the master service is non-ha or not	Jan Chaloupka	2017-10-23	1	-12/+25
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5822 from ewolinetz/bz1504191	Scott Dodson	2017-10-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating to use same image as origin until enterprise image is built
\| * \| \| \| \| \| \| \| \| \| \|	Updating ocp es proxy image to use openshift_logging_proxy_image_prefix if ↵	Eric Wolinetz	2017-10-19	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	specified
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5453 from giuseppe/use-docker-cli-image-if-already-available	OpenShift Merge Robot	2017-10-23	1	-5/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. cli: do not pull again the image when using Docker When CRI-O is used and the CLI image is already pulled into Docker then use it also for copying the CLI files to the host instead of pulling it once again in the ostree storage. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	cli: use the correct name for the master system container	Giuseppe Scrivano	2017-10-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	cli: do not pull again the image when using Docker	Giuseppe Scrivano	2017-10-23	1	-3/+6
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When CRI-O is used and the CLI image is already pulled into Docker then use it also for copying the CLI files to the host instead of pulling it once again in the ostree storage. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5844 from mtnbikenc/fix-1504515	Scott Dodson	2017-10-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1504515 Correct host group for controller restart
\| * \| \| \| \| \| \| \| \| \| \|	Correct host group for controller restart	Russell Teague	2017-10-23	1	-1/+1
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes 1504515 https://bugzilla.redhat.com/show_bug.cgi?id=1504515
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5843 from ingvagabund/set-the-correct-etcd-ip-address	Scott Dodson	2017-10-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the proper external etcd ip address when migrating embeded etcd
\| * \| \| \| \| \| \| \| \| \| \|	Set the proper external etcd ip address when migrating embeded etcd	Jan Chaloupka	2017-10-23	1	-1/+1
\| \|/ / / / / / / / / /
* / / / / / / / / / /	Automatic commit of package [openshift-ansible] release [3.7.0-0.176.0].	Jenkins CD Merge Bot	2017-10-23	2	-2/+14
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \| \| \| \| \| \| \|	Merge pull request #5241 from hansmi/master	Scott Dodson	2017-10-23	4	-0/+37
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add variable to control whether NetworkManager hook is installed
\| * \| \| \| \| \| \| \| \| \|	Add variable to control whether NetworkManager hook is installed	Michael Hanselmann	2017-10-19	4	-0/+37
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We control /etc/resolv.conf and parts of the dnsmasq configuration via Puppet in our environment. The hook ends up overwriting the managed configuration.
* \| \| \| \| \| \| \| \| \|	Merge pull request #5818 from ashcrow/1503860	OpenShift Merge Robot	2017-10-23	2	-8/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. docker: Move enterprise registry from pkg to main
\| * \| \| \| \| \| \| \| \| \|	docker: Move enterprise registry from pkg to main	Steve Milner	2017-10-19	2	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503860 Signed-off-by: Steve Milner <smilner@redhat.com>
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5761 from fabianvf/asb-client-secret-not-found	Scott Dodson	2017-10-23	4	-22/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|	Bug 1496426 - Update ansible-service-broker configuration to use proper certs and permissions
\| * \| \| \| \| \| \| \| \| \|	Update defaults	Fabian von Feilitzsch	2017-10-19	4	-5/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use service-ca.crt instead of master ca.crt	Fabian von Feilitzsch	2017-10-19	1	-16/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	use master cert	Fabian von Feilitzsch	2017-10-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Bug 1496426 - add asb-client secret to openshift-ansible-service-broker ↵	Fabian von Feilitzsch	2017-10-19	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	namespace
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5813 from ashcrow/1503903	OpenShift Merge Robot	2017-10-23	9	-62/+101
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Always ensure atomic.conf is configured for system containers. A new openshift_atomic role has been created for atomic specific tasks. The first task added is proxy which handles updating /etc/atomic.conf to ensure the proper proxy configuration is configured. This task file is then included (via include_role) in system container related task files. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503903