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 #5564 from jcantrill/es_prom	OpenShift Merge Robot	2017-10-05	7	-5/+159
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Add logging es prometheus endpoint This PR adds changes to add a prometheus endpoint to the logging elasticsearch pod
\| *	Add logging es prometheus endpoint	Jeff Cantrill	2017-10-03	7	-5/+159
\| \|
* \|	Merge pull request #5616 from ↵	OpenShift Merge Robot	2017-10-04	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wozniakjan/logging/elasticsearch/honor_es_cpu_settings Automatic merge from submit-queue. logging: honor openshift_logging_es_cpu_limit PR https://github.com/openshift/openshift-ansible/pull/3509 has removed any usage of `openshift_logging_es_cpu_limit`. Currently, the `openshift_logging_elasticsearch_cpu_limit` is either default '1000m' or derived from `openshift_logging_es_ops_cpu_limit` but if user sets the `openshift_logging_es_cpu_limit` in the inventory as documented, its value is ignored. This PR fixes the issue by setting `openshift_logging_elasticsearch_cpu_limit=openshift_logging_es_cpu_limit` and when the role is included as -ops, it overrides this setting with `openshift_logging_es_ops_cpu_limit`.
\| * \|	logging: honor openshift_logging_es_cpu_limit	Jan Wozniak	2017-10-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PR https://github.com/openshift/openshift-ansible/pull/3509 has removed any usage of `openshift_logging_es_cpu_limit`. Currently, the `openshift_logging_elasticsearch_cpu_limit` is either default '1000m' or derived from `openshift_logging_es_ops_cpu_limit` but if user sets the `openshift_logging_es_cpu_limit` in the inventory as documented, its value is ignored. This PR fixes the issue by trying to set openshift_logging_elasticsearch_cpu_limit=openshift_logging_es_cpu_limit And including the role as -ops overrides this setting.
* \| \|	Merge pull request #5636 from ↵	OpenShift Merge Robot	2017-10-04	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mgugino-upstream-stage/limit-openshift-version-hosts Automatic merge from submit-queue. Limit hosts that run openshift_version role Currently, the openshift_version role is run against the oo_all_hosts group. This causes the dependencies, such as openshift_docker and docker, to be run against host groups that were not intended, such as nfs. This commit explicitly limits the openshift_version role to run only against masters, nodes, and etcd host groups. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497144
\| * \| \|	Limit hosts that run openshift_version role	Michael Gugino	2017-10-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, the openshift_version role is run against the oo_all_hosts group. This causes the dependencies, such as openshift_docker and docker, to be run against host groups that were not intended, such as nfs. This commit explicitly limits the openshift_version role to run only against masters, nodes, and etcd host groups. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497144
* \| \| \|	Merge pull request #5647 from mgugino-upstream-stage/docker-reg-auth-after-start	OpenShift Merge Robot	2017-10-04	1	-12/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Ensure docker service started prior to credentials Currently, authenticated registry credentials are requested before docker might be started in the docker role. This commit moves the relevant registry credential tasks to after docker is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
\| * \| \| \|	Ensure docker service started prior to credentials	Michael Gugino	2017-10-03	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, authenticated registry credentials are requested before docker might be started in the docker role. This commit moves the relevant registry credential tasks to after docker is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
* \| \| \| \|	Merge pull request #5543 from ewolinetz/bz1495150	OpenShift Merge Robot	2017-10-04	1	-4/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Removing setting pvc size and dynamic to remove looped var setting If we don't set openshift_logging_es_pvc_size but have `openshift_logging_es_pvc_dynamic=True` we see the variable openshift_logging_elasticsearch_pvc_size is set recursively as itself. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1495150 https://bugzilla.redhat.com/show_bug.cgi?id=1496202
\| * \| \| \| \|	Removing setting pvc size and dynamic to remove looped var setting	Eric Wolinetz	2017-09-26	1	-4/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5643 from mtnbikenc/refactor-certificates	OpenShift Merge Robot	2017-10-04	10	-57/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Refactor certificate playbooks for checkpointing The recent breakout of the certificate playbooks resulted in the certificate portion of the install to be outside of the component checkpoint. This PR moves the certificate playbooks inside their respective config.yml playbook. Removes an unused tasks file from the openshift_named_certificates role.
\| * \| \| \| \| \|	Remove unused tasks file in openshift_named_certificates	Russell Teague	2017-10-03	1	-32/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move node cert playbook into node config path	Russell Teague	2017-10-03	3	-4/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move master cert playbooks into master config path	Russell Teague	2017-10-03	6	-17/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move etcd cert playbooks into etcd config path	Russell Teague	2017-10-03	2	-4/+4
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #5566 from ewolinetz/bz1415297	OpenShift Merge Robot	2017-10-04	3	-25/+66
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Validate storage kinds aren't dynamic without dynamic provisioning enabled Checking if any openshift_*_storage_kind variables are set to dynamic without enabling dynamic provisioning nor setting a cloud provider. Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1415297
\| * \| \| \| \| \|	Addressing tox issues	Eric Wolinetz	2017-09-29	2	-5/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Checking if any openshift_*_storage_kind variables are set to dynamic ↵	Eric Wolinetz	2017-09-27	3	-25/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	without enabling dynamic provisioning
* \| \| \| \| \| \|	Merge pull request #5314 from fabianvf/asb-config-update	OpenShift Merge Robot	2017-10-04	18	-131/+313
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Update broker configuration to track current broker Broker configuration has been drifting from this installer, updated configuration and deployment methods a bit to make it work with the new upstream broker. Note: This will not work well when deploying openshift-enterprise, to deploy openshift-enterprise you will need to use an older checkout of openshift-ansible, or specify the upstream broker + catalog and use a registry other than the RHCC. This is because the configuration for the current upstream broker is incompatible with the downstream broker.
\| * \| \| \| \| \| \|	Update ansible-service-broker config to track latest broker	Fabian von Feilitzsch	2017-10-02	18	-131/+313
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bring ansible service broker up to date with bearer token changes etcd -> 0.0.0.0 add auth information to broker resource in catalog add sandbox role to config simplify defaults add labels to oc_route use new oc_route label field Fix parameter ordering add port back Fix secret syntax
* \| \| \| \| \| \| \|	Merge pull request #5664 from jfchevrette/patch-4	Scott Dodson	2017-10-04	1	-5/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove duplicate [OSEv3:children] group
\| * \| \| \| \| \| \| \|	remove duplicate [OSEv3:children] group	Jean-Francois Chevrette	2017-10-04	1	-5/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #5656 from ephillipe/patch-1	Scott Dodson	2017-10-04	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update hosts.origin.example
\| * \| \| \| \| \| \| \|	Update hosts.ose.example	Erick Almeida	2017-10-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update hosts.origin.example	Erick Almeida	2017-10-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing sample config from: #openshift_metrics_hawkular_hostname=https://hawkular-metrics.example.com/hawkular/metrics To: #openshift_metrics_hawkular_hostname=hawkular-metrics.example.com Reason: When i set my inventory with [openshift_metrics_hawkular_hostname=https://metrics.MYDOMAIN.com/hawkular/metrics/] the results is break of metrics url, like this: [https://https//metrics.cirrus.alterdata.com.br/hawkular/metrics/hawkular/metrics]
* \| \| \| \| \| \| \| \|	Merge pull request #5648 from jcantrill/1497401_default_image_versions	Scott Dodson	2017-10-04	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	bug 1497401. Default logging and metrics images to 3.7
\| * \| \| \| \| \| \| \|	bug 1497401. Default logging and metrics images to 3.7	Jeff Cantrill	2017-10-03	2	-2/+2
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5641 from mgugino-upstream-stage/fix-hosted-selectors	OpenShift Merge Robot	2017-10-03	2	-7/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix hosted selector variable migration Currently, if undefined, openshift_hosted_router_selector and openshift_hosted_registry_selector as set to the value of openshift_hosted_infra_selector. The set_fact logic overrides variable migration inside of oo_filters meant to utilize the deprecated variables openshift_router_selector and openshift_registiry_selector, respectively. This commit corrects the set_fact logic and removes the unused migration from oo_filters. Fixes: https://github.com/openshift/openshift-ansible/issues/5615
\| * \| \| \| \| \| \| \|	Fix hosted selector variable migration	Michael Gugino	2017-10-03	2	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, if undefined, openshift_hosted_router_selector and openshift_hosted_registry_selector as set to the value of openshift_hosted_infra_selector. The set_fact logic overrides variable migration inside of oo_filters meant to utilize the deprecated variables openshift_router_selector and openshift_registiry_selector, respectively. This commit corrects the set_fact logic and removes the unused migration from oo_filters. Fixes: https://github.com/openshift/openshift-ansible/issues/5615
* \| \| \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.7.0-0.143.0].	Jenkins CD Merge Bot	2017-10-04	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \| \| \| \| \| \|	Merge pull request #5606 from ↵	OpenShift Merge Robot	2017-10-03	2	-5/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mgugino-upstream-stage/provision-scale-elb-fixes-master Automatic merge from submit-queue. Fix provisiong scale group and elb logic Some changes necessary to support provisioning and scale group logic Some of this work is duplicated from an existing PR. That PR is about to merge, so I'll rebase once that hits.
\| * \| \| \| \| \| \| \| \|	Fix provisiong scale group and elb logic	Michael Gugino	2017-09-29	4	-11/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some changes necessary to support provisioning and scale group logic
* \| \| \| \| \| \| \| \| \|	Merge pull request #5632 from ↵	OpenShift Merge Robot	2017-10-03	6	-1/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mgugino-upstream-stage/limit-version-upgrade-masters Automatic merge from submit-queue. Limit base-package install during master upgrades Currently, openshift_version installs RPM packages on all nodes and masters to aid in determining and setting the proper version across the cluster. This commit limits the host groups to only masters during upgrade_control_plane plays. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1495107
\| * \| \| \| \| \| \| \| \| \|	Limit base-package install during master upgrades	Michael Gugino	2017-10-02	6	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, openshift_version installs RPM packages on all nodes and masters to aid in determining and setting the proper version across the cluster. This commit limits the host groups to only masters during upgrade_control_plane plays. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1495107
* \| \| \| \| \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.7.0-0.142.0].	Jenkins CD Merge Bot	2017-10-03	2	-2/+15
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \| \| \| \| \| \| \|	Merge pull request #5633 from mgugino-upstream-stage/fix-node-cloudprovider	OpenShift Merge Robot	2017-10-03	2	-16/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Move node aws credentials to config.yml Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
\| * \| \| \| \| \| \| \| \| \|	Move node aws credentials to config.yml	Michael Gugino	2017-10-02	2	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5638 from sdodson/bz1488366	Scott Dodson	2017-10-03	2	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document that nfs_directory must conform to DNS-1123
\| * \| \| \| \| \| \| \| \| \| \|	Document that nfs_directory must conform to DNS-1123	Scott Dodson	2017-10-03	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1488366
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5621 from abutcher/scaleup-portal-net	OpenShift Merge Robot	2017-10-03	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Ensure openshift.common.portal_net updated during scaleup. https://bugzilla.redhat.com/show_bug.cgi?id=1451023 This fact is set in `initialize_facts.yml` at the beginning of scaleup so make sure that we update this fact if we read a different value from the first master's config file.
\| * \| \| \| \| \| \| \| \| \| \|	Ensure openshift.common.portal_net updated during scaleup.	Andrew Butcher	2017-10-02	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-ose	OpenShift Merge Robot	2017-10-03	3	-9/+35
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. CRI-O, Docker: set the tag to the OpenShift release on RHEL Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
\| * \| \| \| \| \| \| \| \| \| \|	docker: fix some tox warnings	Giuseppe Scrivano	2017-09-27	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	Require openshift_image_tag in the inventory with openshift-enterprise	Giuseppe Scrivano	2017-09-27	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	crio: use the image_tag on RHEL	Giuseppe Scrivano	2017-09-27	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \| \| \| \| \| \|	docker: use the image_tag on RHEL	Giuseppe Scrivano	2017-09-27	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5630 from abutcher/etcd-scaleup-target	OpenShift Merge Robot	2017-10-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Use etcd_ip when communicating with the cluster as a peer in etcd scaleup. We can't communicate with the hostname here since etcd will be [configured to listen to its IP address](https://github.com/openshift/openshift-ansible/blob/ead22bb1c3b6d6366502b14b97b7aae5605f8a58/roles/etcd/defaults/main.yaml#L69). Fixes https://github.com/openshift/openshift-ansible/issues/5620
\| * \| \| \| \| \| \| \| \| \| \|	Use etcd_ip when communicating with the cluster as a peer in etcd scaleup.	Andrew Butcher	2017-10-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.7.0-0.141.0].	Jenkins CD Merge Bot	2017-10-03	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5629 from mgugino-upstream-stage/duplicate-docker-regs	OpenShift Merge Robot	2017-10-03	1	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Restore registires to /etc/sysconfig/docker Previously, a commit was added to migrate registires from /etc/sysconfig/docker to /etc/containers/registries.conf We are not currently enforcing a minimum version of docker to consume from this new file, thus some installations are not utilizing the correct repositories. This commit duplicates the registires in both locations to ensure additional/blocked/insecure registries are honored.