diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-12 21:58:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 21:58:20 -0800 |
| commit | 648fc450f3d0a8ec31661a9656f09c6c57615bc0 (patch) | |
| tree | a330ba4d7c03b48ff1e7da588fcb599f1589664e | |
| parent | e4111f2acca12db04a6ef3241acc4250e488719b (diff) | |
| parent | 47d06eda6a989477d2f618c1872cf7635744173a (diff) | |
| download | openshift-648fc450f3d0a8ec31661a9656f09c6c57615bc0.tar.gz openshift-648fc450f3d0a8ec31661a9656f09c6c57615bc0.tar.bz2 openshift-648fc450f3d0a8ec31661a9656f09c6c57615bc0.tar.xz openshift-648fc450f3d0a8ec31661a9656f09c6c57615bc0.zip | |
Merge pull request #7117 from mgugino-upstream-stage/fix-gcp-vars
Automatic merge from submit-queue.
Fix gcp variable warnings
This commit ensures that user get better information
regarding variables that need to be defined in
inventory when using gcp.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1541589
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/gce.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/roles/openshift_cloud_provider/tasks/gce.yml b/roles/openshift_cloud_provider/tasks/gce.yml index 9e1c31b1d..dff5fa09c 100644 --- a/roles/openshift_cloud_provider/tasks/gce.yml +++ b/roles/openshift_cloud_provider/tasks/gce.yml @@ -1,11 +1,13 @@ --- - name: check variables are passed fail: - msg: "Ensure correct variables are defined for gcp. {{ item }}" - when: item == '' + msg: "Ensure correct variables are defined for gcp. {{ item.name }}" + when: item.value == '' with_items: - - "{{ openshift_gcp_project }}" - - "{{ openshift_gcp_prefix }}" + - name: openshift_gcp_project + value: "{{ openshift_gcp_project }}" + - name: openshift_gcp_prefix + value: "{{ openshift_gcp_prefix }}" # Work around ini_file create option in 2.2 which defaults to no - name: Create cloud config file |