summaryrefslogtreecommitdiffstats
path: root/roles/openshift_cloud_provider
diff options
context:
space:
mode:
authorDan Yocum <dyocum@redhat.com>2018-01-24 17:15:26 -0500
committerDan Yocum <dyocum@redhat.com>2018-01-24 17:15:26 -0500
commit8cbd53ed64f1819b8f4defbf196140a1692c5a42 (patch)
tree7dd61610e8ea6ae373e12dbb1c894047b8feac0f /roles/openshift_cloud_provider
parentc2de775c80b8daa629af514f24118f704c521c18 (diff)
parent0b57e113dbf16b5ac6f01859c9c4ab2aee594f87 (diff)
downloadopenshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.gz
openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.bz2
openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.xz
openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.zip
Merge branch 'master' into rm_origin-components
Diffstat (limited to 'roles/openshift_cloud_provider')
-rw-r--r--roles/openshift_cloud_provider/tasks/gce.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/roles/openshift_cloud_provider/tasks/gce.yml b/roles/openshift_cloud_provider/tasks/gce.yml
index ee4048911..395bd304c 100644
--- a/roles/openshift_cloud_provider/tasks/gce.yml
+++ b/roles/openshift_cloud_provider/tasks/gce.yml
@@ -13,5 +13,11 @@
ini_file:
dest: "{{ openshift.common.config_base }}/cloudprovider/gce.conf"
section: Global
- option: multizone
- value: "true"
+ option: "{{ item.key }}"
+ value: "{{ item.value }}"
+ with_items:
+ - { key: 'project-id', value: '{{ openshift_gcp_project }}' }
+ - { key: 'network-name', value: '{{ openshift_gcp_network_name }}' }
+ - { key: 'node-tags', value: '{{ openshift_gcp_prefix }}ocp' }
+ - { key: 'node-instance-prefix', value: '{{ openshift_gcp_prefix }}' }
+ - { key: 'multizone', value: 'false' }