Merge pull request #7122 from mgugino-upstream-stage/add-gcp-multizone-var

Automatic merge from submit-queue.

Add openshift_gcp_multizone bool

Add openshift_gcp_multizone bool that defaults
to False to enable users to support multizone
deployments on gcp.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542843

roles/openshift_cloud_provider/defaults/main.yml

@@ -2,3 +2,4 @@
 openshift_gcp_project: ''
 openshift_gcp_prefix: ''
 openshift_gcp_network_name: "{{ openshift_gcp_prefix }}network"
+openshift_gcp_multizone: False

roles/openshift_cloud_provider/tasks/gce.yml

@@ -30,4 +30,4 @@
   - { 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' }
+  - { key: 'multizone', value: '{{ openshift_gcp_multizone | string }}' }

roles/openshift_gcp/defaults/main.yml

@@ -56,3 +56,5 @@ openshift_gcp_node_group_config:
 
 openshift_gcp_startup_script_file: ''
 openshift_gcp_user_data_file: ''
+
+openshift_gcp_multizone: False

roles/openshift_gcp/tasks/node_cloud_config.yml

@@ -9,4 +9,4 @@
     - { 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' }
+    - { key: 'multizone', value: '{{ openshift_gcp_multizone | string }}' }