diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 04:05:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 04:05:59 -0700 |
| commit | 42b4e7da984b6f755ed773b062eec8a7d90e8d60 (patch) | |
| tree | 82890524b7cbd749118dbcbac7f30202b66e2c03 /roles/flannel | |
| parent | 84187cc9f4968d4dc7979a91edfe19459ab97089 (diff) | |
| parent | b09c00ddb0ec802fb19dced5b1c464aad9c6d1ea (diff) | |
| download | openshift-42b4e7da984b6f755ed773b062eec8a7d90e8d60.tar.gz openshift-42b4e7da984b6f755ed773b062eec8a7d90e8d60.tar.bz2 openshift-42b4e7da984b6f755ed773b062eec8a7d90e8d60.tar.xz openshift-42b4e7da984b6f755ed773b062eec8a7d90e8d60.zip | |
Merge pull request #5989 from tbielawa/bz1506951
Automatic merge from submit-queue.
CFME: Use cluster_hostname if cluster_public_hostname isn't available
The CFME 'automatically add provider' playbook would fail if
openshift_master_cluster_public_hostname was not defined in the
inventory. Now we use that value if it is available, and fallback to
using the masters 'cluster_hostname' otherwise.
* Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506951
Diffstat (limited to 'roles/flannel')
0 files changed, 0 insertions, 0 deletions