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 #6835 from mtnbikenc/fix-1537105	OpenShift Merge Robot	2018-01-23	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. [1537105] Add openshift_facts to flannel role Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537105
\| *	[1537105] Add openshift_facts to flannel role	Russell Teague	2018-01-23	1	-0/+1
\| \|
* \|	Merge pull request #6833 from joelddiaz/boto3-rhel7	OpenShift Merge Robot	2018-01-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. update Dockerfile to add boto3 dependency
\| * \|	update Dockerfile to add boto3 dependency	Joel Diaz	2018-01-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	The centos-based Dockerfile has previously been updated to pull in the python2-boto3 RPM; update the RHEL-based Dockerfile to do the same now that python2-boto3 has been made available in the appropriate repo.
* \| \|	Merge pull request #6837 from spadgett/cro	OpenShift Merge Robot	2018-01-23	2	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Add clusterResourceOverridesEnabled to console config Adds clusterResourceOverridesEnabled flag to console install. See https://github.com/openshift/api/pull/32 See https://github.com/openshift/origin/pull/18231 /assign @sdodson /cc @jwforres
\| * \| \|	Add clusterResourceOverridesEnabled to console config	Samuel Padgett	2018-01-23	2	-0/+3
\| \| \| \|
* \| \| \|	Merge pull request #6802 from mgugino-upstream-stage/fix-etcd-scaleup	OpenShift Merge Robot	2018-01-23	4	-3/+56
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix etcd scaleup playbook Currently, etcd scaleup playbook has no way to account for newly added prerequisites.yml play. This commit allows adding new etcd hosts via scaleup play and accounts for etcd hosts that are standalone or part of nodes or masters group.
\| * \| \| \|	Fix etcd scaleup playbook	Michael Gugino	2018-01-22	4	-3/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, etcd scaleup playbook has no way to account for newly added prerequisites.yml play. This commit allows adding new etcd hosts via scaleup play and accounts for etcd hosts that are standalone or part of nodes or masters group.
* \| \| \| \|	Merge pull request #6827 from vrutkovs/node-uppercase-certificates	OpenShift Merge Robot	2018-01-23	3	-12/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Lowercase node names when creating certificates Additional fix for https://github.com/openshift/openshift-ansible/pull/6812
\| * \| \| \| \|	Lowercase node names when creating certificates	Vadim Rutkovsky	2018-01-23	3	-12/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6682 from giuseppe/fix-registries	Michael Gugino	2018-01-23	2	-27/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CRI-O, Docker: Use images from the CentOS and Fedora registry
\| * \| \| \| \| \|	docker_creds: fix python3 exception	Giuseppe Scrivano	2018-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: Object of type 'bytes' is not JSON serializable Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \|	docker_creds: fix python3 exception	Giuseppe Scrivano	2018-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Solves this exception with python3: TypeError: a bytes-like object is required, not 'str Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \|	docker: use image from CentOS and Fedora registries	Giuseppe Scrivano	2018-01-10	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
\| * \| \| \| \| \|	crio: use Docker and CentOS registries for the image	Giuseppe Scrivano	2018-01-10	1	-19/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6808 from spadgett/check-console-config-exists	OpenShift Merge Robot	2018-01-23	1	-36/+41
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Bug 1534020 - Only set logging and metrics URLs if console config map exists Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534020 Related to #6676, but for the tasks that update logging and metrics URLs. /king bug /assign @sdodson
\| * \| \| \| \| \| \|	Bug 1534020 - Only set logging and metrics URLs if console config map exists	Samuel Padgett	2018-01-21	1	-36/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534020
* \| \| \| \| \| \| \|	Merge pull request #6817 from mtnbikenc/fix-1506750	OpenShift Merge Robot	2018-01-23	4	-7/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. [1506750] Ensure proper hostname check override Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506750
\| * \| \| \| \| \| \| \|	[1506750] Ensure proper hostname check override	Russell Teague	2018-01-22	4	-7/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6783 from mgugino-upstream-stage/node-syscon-add-mounts	Scott Dodson	2018-01-23	3	-0/+45
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|	Add ability to mount volumes into system container nodes
\| * \| \| \| \| \| \| \|	Add ability to mount volumes into system container nodes	Michael Gugino	2018-01-18	3	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds the ability to mount volumes into system containerized nodes. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1534933
* \| \| \| \| \| \| \| \|	Merge pull request #6812 from sdodson/bz1396350	OpenShift Merge Robot	2018-01-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Ensure that node names are lowerecased before matching The name field is always lowercase whereas the nodename may not have been in the past. Ensure that we lowercase it before looking for matching nodes. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1396350
\| * \| \| \| \| \| \| \|	Ensure that node names are lowerecased before matching	Scott Dodson	2018-01-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The name field is always lowercase whereas the nodename may not have been in the past. Ensure that we lowercase it before looking for matching nodes. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1396350
* \| \| \| \| \| \| \| \|	Merge pull request #6504 from mbruzek/mbruzek-openshift-openstack	Russell Teague	2018-01-23	1	-6/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The provision_install file ends in yml not yaml! Ansible requirement …
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into mbruzek-openshift-openstack	Matt Bruzek	2018-01-18	643	-4016/+13638
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	The provision_install file ends in yml not yaml! Ansible requirement ↵	Matt Bruzek	2017-12-15	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clarification.
* \| \| \| \| \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.9.0-0.23.0].	Jenkins CD Merge Bot	2018-01-23	2	-2/+26
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* \| \| \| \| \| \| \| \| \|	Merge pull request #6676 from spadgett/upgrade-console	OpenShift Merge Robot	2018-01-22	1	-25/+81
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Bug 1536924: Migrate previous asset config from master-config.yaml Copy configuration from master-config.yaml to the openshift-web-console asset config config map. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536924 TODO: - [x] Don't overwrite config map if it exists Follow on: - [ ] Remove assetConfig from master-config.yaml on upgrades to 3.9 - [ ] Warn about existing extensions that aren't migrated on upgrades /assign @sdodson /hold cc @jwforres
\| * \| \| \| \| \| \| \| \| \|	Migrate master-config.yaml asset config	Samuel Padgett	2018-01-21	1	-25/+81
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Don't overwrite existing webconsole-config config map * Copy configuration from master-config.yaml on upgrade
* \| \| \| \| \| \| \| \| \|	Merge pull request #6716 from sosiouxme/20180112-skopeo-proxies	OpenShift Merge Robot	2018-01-22	1	-6/+26
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. docker_image_availability: enable skopeo to use proxies Fixes https://github.com/openshift/openshift-ansible/issues/6300 and https://bugzilla.redhat.com/show_bug.cgi?id=1499358 Run skopeo via shell and add in environment variables for proxies if specified in variables.
\| * \| \| \| \| \| \| \| \| \|	docker_image_availability: enable skopeo to use proxies	Luke Meyer	2018-01-22	1	-6/+26
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run skopeo via shell and add in environment variables for proxies if specified in variables.
* \| \| \| \| \| \| \| \| \|	Merge pull request #6796 from mgugino-upstream-stage/fix-etcd-upgrade-sanity	Scott Dodson	2018-01-22	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix etcd upgrade sanity
\| * \| \| \| \| \| \| \| \| \|	Fix etcd-upgrade sanity checks	Michael Gugino	2018-01-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit ensures that only oo_etcd_to_config and oo_masters_to_config are checked during sanity_checks. This will prevent hosts that have not had facts gathered (such as nodes) will not be processed for correct inventory and runtime facts. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536317
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6800 from bparees/admin	OpenShift Merge Robot	2018-01-22	2	-6/+18
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. use admin credentials for tsb install operations
\| * \| \| \| \| \| \| \| \| \| \|	use admin credentials for tsb install operations	Ben Parees	2018-01-19	2	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6533 from joelddiaz/prereqs_uninstall	OpenShift Merge Robot	2018-01-22	9	-0/+113
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. allow uninstalling AWS objects created by prerequisite playbook add deprovisioners/uninstallers for objects created via playbooks/aws/openshift-cluster/prerequisites.yml specifically: security groups, vpcs, and any ssh keys introduce openshift_aws_enable_uninstall_shared_objects to protect AWS objects that would be shared in the case of multiple clusters co-existing in one AWS account. right now it protects the ssh keys, but it can/should be used to protect against deleting the shared IAM instance profile as well. default this variable to False to be on the safe side when uninstalling/deprovisioning.
\| * \| \| \| \| \| \| \| \| \| \| \|	allow uninstalling AWS objects created by prerequisite playbook	Joel Diaz	2018-01-22	9	-0/+113
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add deprovisioners/uninstallers for objects created via playbooks/aws/openshift-cluster/prerequisites.yml specifically: security groups, vpcs, and any ssh keys introduce openshift_aws_enable_uninstall_shared_objects to protect AWS objects that would be shared in the case of multiple clusters co-existing in one AWS account. right now it protects the ssh keys, but it can/should be used to protect against deleting the shared IAM instance profile as well. default this variable to False to be on the safe side when uninstalling/deprovisioning. add some documentation on using deprovisioning playbooks
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6814 from mgugino-upstream-stage/move-up-base-packages	OpenShift Merge Robot	2018-01-22	6	-46/+60
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Install base_packages earlier Currently, openshift_facts requires pyyaml to be installed. This package is installed via init/base_packages.yml, which is currently called after init/facts.yml. This results in a situation where installs will fail due to missing python dependency. This commit splits init/facts.yml into two, and allows base_packages.yml to be run before the openshift_facts.py plugin is executed.
\| * \| \| \| \| \| \| \| \| \| \| \|	Install base_packages earlier	Michael Gugino	2018-01-22	6	-46/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, openshift_facts requires pyyaml to be installed. This package is installed via init/base_packages.yml, which is currently called after init/facts.yml. This results in a situation where installs will fail due to missing python dependency. This commit splits init/facts.yml into two, and allows base_packages.yml to be run before the openshift_facts.py plugin is executed.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6797 from sdodson/bz1523638	OpenShift Merge Robot	2018-01-22	4	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Adjust registry-console's prefix to be fully qualified 3 commits for easy cherry-picking into release-3.7 and release-3.6 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1523638
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix enterprise registry-console prefix	Scott Dodson	2018-01-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[release-3.7] Fix enterprise registry console image prefix	Scott Dodson	2018-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[release-3.6] Fix enterprise registry console image prefix	Scott Dodson	2018-01-19	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6793 from mgugino-upstream-stage/fix-master-scaleup	OpenShift Merge Robot	2018-01-22	2	-10/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix master scaleup This commit builds off https://github.com/openshift/openshift-ansible/pull/6784 Enables openshift-master/scaleup.yml to call prerequisites.yml as required. Also modifies some failure conditions around how scaleup plays are called to ensure inventories are better aligned with playbook behavior.
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix master scaleup play	Michael Gugino	2018-01-19	2	-10/+39
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow playbooks/openshift-master/scaleup.yml to call prerequisites.yml at the proper time. Related-to: https://github.com/openshift/openshift-ansible/pull/6784
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6798 from nhosoi/bz1512825	OpenShift Merge Robot	2018-01-22	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Bug 1512825 - add mux pod failed for Serial number 02 has already been issued According to mkhan@redhat.com, to run the "oc adm ca create-server-cert" command line with --signer-serial option, the following changes need to be made. 1. adding --overwrite=false 2. <ca.serial.txt> should contain only [0-9A-F]*. (no trailing newlines are allowed for now) This patch solves 1.
\| * \| \| \| \| \| \| \| \| \| \|	Bug 1512825 - add mux pod failed for Serial number 02 has already been issued	Noriko Hosoi	2018-01-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to mkhan@redhat.com, to run the "oc adm ca create-server-cert" command line with --signer-serial option, the following changes need to be made. 1. adding --overwrite=false 2. <ca.serial.txt> should contain only [0-9A-F]*. (no trailing newlines are allowed for now) This patch solves 1.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6525 from luis5tb/fix-provider-network	Michael Gugino	2018-01-22	2	-9/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Fix provider network support at openstack playbook
\| * \| \| \| \| \| \| \| \| \| \|	Fix provider network support at openstack playbook	Luis Tomas Bolivar	2018-01-08	2	-9/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It ensures no floating ips are attached if a provider network is used
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6806 from spadgett/console-node-selector	OpenShift Merge Robot	2018-01-21	2	-3/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Bug 1536262: Default console and TSB node selector to openshift_hosted_infra_selector Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536262 Fixes #6805 /kind bug /assign @sdodson @jupierce You should no longer need to set `openshift_web_console_nodeselector` when this merges. @bparees @jim-minter FYI, I switched the TSB default as well.