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

	Commit message (Collapse)	Author	Age	Files	Lines
*	registry-console: align image and check	Luke Meyer	2017-11-15	4	-10/+16
\| \| \| \| \|	enable option to configure basename in image docker_image_availability check: follow registry-console image options
*	registry-console template 3.8 consistency	Luke Meyer	2017-11-15	2	-5/+11
\| \| \| \|	don't hardcode the enterprise registry; construct the image like origin
*	registry-console template 3.7 consistency	Luke Meyer	2017-11-15	2	-5/+11
\| \| \| \|	don't hardcode the enterprise registry; construct the image like origin
*	registry-console template 3.6 consistency	Luke Meyer	2017-11-15	2	-5/+11
\| \| \| \|	don't hardcode the enterprise registry; construct the image like origin
*	Merge pull request #6105 from kwoodson/docker_crio_fix	Scott Dodson	2017-11-15	1	-1/+1
\|\ \| \| \| \|	Fixing docker crio installation.
\| *	Fixing islnk.	Kenny Woodson	2017-11-13	1	-1/+1
\| \|
* \|	Added aos-3.8 releaser for tito	Jenkins CD Merge Bot	2017-11-15	1	-0/+4
\| \|
* \|	Merge pull request #6079 from mgugino-upstream-stage/fix-log-local-facts	OpenShift Merge Robot	2017-11-15	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix stale data in openshift_facts for logging Currently, some stale facts may be present in '/etc/ansible/facts.d/openshift.fact' which causes openshift_facts to fail. This commit ensures that the data for the 'logging' key in that file is a dictionary; otherwise we re-initialize a new dictionary. Fixes: https://github.com/openshift/openshift-ansible/issues/6057
\| * \|	Fix stale data in openshift_facts for logging	Michael Gugino	2017-11-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, some stale facts may be present in '/etc/ansible/facts.d/openshift.fact' which causes openshift_facts to fail. This commit ensures that the data for the 'logging' key in that file is a dictionary; otherwise we re-initialize a new dictionary. Fixes: https://github.com/openshift/openshift-ansible/issues/6057
* \| \|	Merge pull request #5968 from mgugino-upstream-stage/version-scrub	Scott Dodson	2017-11-15	28	-285/+16
\|\ \ \ \| \| \| \| \| \| \| \|	Removed old version code
\| * \| \|	Removed old version code	Michael Gugino	2017-11-14	28	-285/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit removes any references to versions < 1.5/3.5 We assume the version is always greater than or equal to 1.5/3.5.
* \| \| \|	Automatic commit of package [openshift-ansible] release [3.8.0-0.1.0].	Jenkins CD Merge Bot	2017-11-15	2	-2/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \|	Merge pull request #6051 from mgugino-upstream-stage/docker-containers-proposal	OpenShift Merge Robot	2017-11-15	1	-0/+113
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Proposal: container_runtime role This is a proposal meant to facilitate discussion. Input is welcome.
\| * \| \| \|	Proposal: container_runtime role	Michael Gugino	2017-11-07	1	-0/+113
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a proposal meant to facilitate discussion. Input is welcome.
* \| \| \| \|	Merge pull request #6094 from ↵	OpenShift Merge Robot	2017-11-15	12	-2/+299
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mgugino-upstream-stage/syscontainers-docker-login-module Automatic merge from submit-queue. Alternative method to create docker registry auth creds Currently, the command 'docker login' is run when using oreg with authentication. On some hosts, such as hosts configured to use system containers, the docker service is not running. 'docker login' will fail without the docker service running. This commit adds a module to idempotently add credentials to the registry credentials file without the use of 'docker login' Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
\| * \| \| \| \|	Alternative method to create docker registry auth creds	Michael Gugino	2017-11-14	12	-2/+299
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, the command 'docker login' is run when using oreg with authentication. On some hosts, such as hosts configured to use system containers, the docker service is not running. 'docker login' will fail without the docker service running. This commit adds a module to idempotently add credentials to the registry credentials file without the use of 'docker login' Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
* \| \| \| \| \|	Merge pull request #5846 from kwoodson/cluster_install_order	OpenShift Merge Robot	2017-11-15	3	-4/+53
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Switch up the cluster install order. The purpose of this pull request is to change the order of installation to the following: - Provision masters - Install masters - Provision node groups (infra/compute) - Join nodes to cluster (approval process) - Call hosted playbooks on entire cluster This model of install is a bit more robust than the previous one of bringing up nodes after hosted has been installed. This method allows us to have all nodes available when the services are being configured rather than after-the-fact.
\| * \| \| \| \| \|	Updating provisioning order.	Kenny Woodson	2017-11-13	3	-4/+53
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #5967 from gregswift/uninstall	OpenShift Merge Robot	2017-11-15	1	-14/+55
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Cleans up additional artifacts in uninstall. Closes 3082 Closes #3082
\| * \| \| \| \| \|	Cleans up additional artifacts in uninstall. Closes 3082	Greg Swift	2017-10-31	1	-14/+55
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6102 from mgugino-upstream-stage/fix-docker-reg-auth-proxy	OpenShift Merge Robot	2017-11-14	1	-2/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Run registry auth after docker restart Currently, docker login may fail if a proxy is added to the config but docker is already running. This is due to the fact that 'docker login' must have a functioning docker.service running (with valid network connection) to complete. Currently, handlers restart the docker service at the end of the role. This doesn't allow for updating proxy settings before running docker login. This commit moves 'docker login' command after flushing handlers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511869
\| * \| \| \| \| \| \|	Run registry auth after docker restart	Michael Gugino	2017-11-13	1	-2/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, docker login may fail if a proxy is added to the config but docker is already running. This is due to the fact that 'docker login' must have a functioning docker.service running (with valid network connection) to complete. Currently, handlers restart the docker service at the end of the role. This doesn't allow for updating proxy settings before running docker login. This commit moves 'docker login' command after flushing handlers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511869
* \| \| \| \| \| \|	Merge pull request #6095 from kwoodson/add_instance_profile_support	OpenShift Merge Robot	2017-11-14	9	-0/+88
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Instance profile support. Purpose of this PR is to remove the AWS cloud-provider credentials from the node and use instance profiles during provisioning time.
\| * \| \| \| \| \| \|	Adding instance profile support for node groups.	Kenny Woodson	2017-11-13	9	-0/+88
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #6091 from sosiouxme/20171110-ini-parse-failure	OpenShift Merge Robot	2017-11-14	2	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. ansible.cfg: error when inventory does not parse As of Ansible 2.4 this option exists: https://github.com/ansible/ansible/issues/15035#issuecomment-329672168 The kind of error you get later when this is your real problem tends to be very confusing. Much better to just fail right away. I cannot think of any scenario in which it would be preferable to proceed when inventory parsing fails.
\| * \| \| \| \| \| \|	ansible.cfg: error when inventory does not parse	Luke Meyer	2017-11-10	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As of Ansible 2.4 this option exists: https://github.com/ansible/ansible/issues/15035#issuecomment-329672168 The kind of error you get later when this is your real problem tends to be very confusing. Much better to just fail right away.
* \| \| \| \| \| \| \|	Merge pull request #6081 from kwoodson/remove_oc_edit_restrictions	OpenShift Merge Robot	2017-11-14	2	-28/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. removing kind restrictions from oc_edit Removing any kind restriction on oc_edit. This allows it to just call the API which in most cases works.
\| * \| \| \| \| \| \| \|	removing kind restrictions from oc_edit	Kenny Woodson	2017-11-09	2	-28/+2
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6068 from mtnbikenc/remove-old-upgrades	OpenShift Merge Robot	2017-11-14	33	-1389/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Remove upgrade playbooks for 3.3 through 3.5 Release branches should be used for older upgrades.
\| * \| \| \| \| \| \| \|	Remove upgrade playbooks for 3.3 through 3.5	Russell Teague	2017-11-08	33	-1389/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6115 from sdodson/disable-auth-migration	Scott Dodson	2017-11-14	2	-20/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow disabling authorization migration check
\| * \| \| \| \| \| \| \| \|	Allow disabling authorization migration check	Scott Dodson	2017-11-14	2	-20/+24
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #6054 from nak3/cleanup-lb	OpenShift Merge Robot	2017-11-14	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Remove remaining haproxy files with uninstallation Although OpenShift LB(HAProxy) distributes `/etc/systemd/system/haproxy.service.d/limits.conf` and `/etc/systemd/system/haproxy.service`, uninstall playbook does not remove them now. This patch changes to remove these files.
\| * \| \| \| \| \| \| \| \|	Remove remaining haproxy files with uninstallation	Kenjiro Nakayama	2017-11-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5948 from mtnbikenc/checkpoint-times	OpenShift Merge Robot	2017-11-14	17	-175/+191
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Add execution times to checkpoint status This PR adds execution times to the checkpoint status report at the end of an installer playbook run. - Checkpoint plays now use `all` host group to avoid using an undefined host group during the Initialization phase as well as maintaining the need to collect inventory vars for host group conditionals - `run_once: true` is used to limit the execution to only one host - `installer_phase_` data is now stored as a dict so multiple data points can be stored for that phase - Documentation updated ``` INSTALLER STATUS ************************************************************** Initialization : Complete (0:02:14) Health Check : Complete (0:01:10) etcd Install : Complete (0:02:01) Master Install : Complete (0:11:43) Master Additional Install : Complete (0:00:54) Node Install : Complete (0:14:11) Hosted Install : Complete (0:03:28) ```
\| * \| \| \| \| \| \| \| \|	Add execution times to checkpoint status	Russell Teague	2017-10-31	17	-175/+191
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #6110 from sdodson/dockershim	Scott Dodson	2017-11-14	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nuke /var/lib/dockershim/sandbox/* while nodes are drained
\| * \| \| \| \| \| \| \| \| \|	Nuke /var/lib/dockershim/sandbox/* while nodes are drained	Scott Dodson	2017-11-14	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5784 from jarrpa/glusterfs-new-features	OpenShift Merge Robot	2017-11-14	16	-61/+655
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. GlusterFS: Update for new features This is a small collection of updates to take advantage of new features available for containerized GlusterFS, currently available downstream in CNS 3.6.
\| * \| \| \| \| \| \| \| \| \| \|	GlusterFS: Add gluster-s3 functionality	Jose A. Rivera	2017-11-08	8	-45/+420
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	GlusterFS: Add glusterblock functionality	Jose A. Rivera	2017-11-08	9	-0/+210
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	GlusterFS: Update heketi templates for latest version	Jose A. Rivera	2017-11-08	8	-16/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	GlusterFS: Specify resource requests	Jose A. Rivera	2017-11-08	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5942 from giuseppe/crio-sync-configuration	Scott Dodson	2017-11-14	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	crio: sync crio.conf
\| * \| \| \| \| \| \| \| \| \| \|	crio: sync crio.conf	Giuseppe Scrivano	2017-11-14	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5921 from lpsantil/make-nfs-clear	Michael Gugino	2017-11-14	1	-6/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Make clearer _nfs_directory and _volume_name
\| * \| \| \| \| \| \| \| \| \| \|	Make clearer _nfs_directory and _volume_name	lpsantil	2017-10-28	1	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-json	Scott Dodson	2017-11-13	5	-17/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix extension script for catalog
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix extension script for catalog	Michael Gugino	2017-11-13	5	-17/+10
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, playbook wire_aggregator places an empty plugin script for openshift master called openshift-ansible-catalog-console.js This file should not be empty if using template_service_broker. I have updated this file to include a boolean and the proper string. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506502
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6104 from kwoodson/regex_cors_fix	Scott Dodson	2017-11-13	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regex anchors changed to match protocol start and ports.