diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-22 09:19:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 09:19:16 -0800 |
| commit | 9dc31f10b113cb0ceab1ba992ad2609da140ba6f (patch) | |
| tree | 12d9a72fccc2882ef19b34fe8ce15fa76f1e48d5 /files | |
| parent | 4d93123e9626657e55ce03cb8a0288a6ba5e3f2e (diff) | |
| parent | 682ddb8744af07939c39699f223cc6455bdece01 (diff) | |
| download | openshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.tar.gz openshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.tar.bz2 openshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.tar.xz openshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.zip | |
Merge pull request #6793 from mgugino-upstream-stage/fix-master-scaleup
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.
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions