diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-17 08:54:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 08:54:15 -0700 |
| commit | 7908efc7b011168a7587ee99b07d1acde0dab69c (patch) | |
| tree | b34e191ef9f123de6e75aa9324803aebff47b078 /roles/calico/meta | |
| parent | e8091b34a6aa0db61f639b4d0705519009cfc1e8 (diff) | |
| parent | ea94cacab228b5134024d2a86142964e82a35639 (diff) | |
| download | openshift-7908efc7b011168a7587ee99b07d1acde0dab69c.tar.gz openshift-7908efc7b011168a7587ee99b07d1acde0dab69c.tar.bz2 openshift-7908efc7b011168a7587ee99b07d1acde0dab69c.tar.xz openshift-7908efc7b011168a7587ee99b07d1acde0dab69c.zip | |
Merge pull request #5765 from abutcher/service-serving-cert-typo
Automatic merge from submit-queue.
Ensure controllerConfig.serviceServingCert is correctly set during upgrade.
A typo was originally introduced in https://github.com/openshift/openshift-ansible/pull/2449 causing an incorrect key to be configured within the master config. This commit ensures that the correct key is set during upgrades.
/cc @dlbewley
https://bugzilla.redhat.com/show_bug.cgi?id=1500981
Diffstat (limited to 'roles/calico/meta')
0 files changed, 0 insertions, 0 deletions