diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-18 14:56:30 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 14:56:30 -0800 |
commit | 453027d9c7161b43d6529ba12a83b8d6fa459b72 (patch) | |
tree | ba84d7f5b7c59ac413716604a23d43bb80febcf4 /roles/calico_master | |
parent | bccd1a8f97036febc0e9bf8666ec6b9a5f4ced65 (diff) | |
parent | fcbae1beea767791e2482b0a961ecfd2106ddcde (diff) | |
download | openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.tar.gz openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.tar.bz2 openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.tar.xz openshift-453027d9c7161b43d6529ba12a83b8d6fa459b72.zip |
Merge pull request #6760 from mgugino-upstream-stage/fix-docker-atomic-proxies
Automatic merge from submit-queue.
Ensure atomic_proxies are configured with docker
In some setups, system containers may be used
in conjunction with package_docker.
This commit ensures that the atomic
proxies are configured while using package_docker
and containerized components.
This commit also ensures containerized_groups
are based on openshift_is_containerized instead
of 'containerized' variable directly to
account for possible use of atomic hosts which
users may not specify containerized in inventory
directly.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1535323
Diffstat (limited to 'roles/calico_master')
0 files changed, 0 insertions, 0 deletions