diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-13 00:53:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 00:53:31 -0800 |
| commit | dea7e61fd333b2e167cc5a001e1e8f794402c045 (patch) | |
| tree | 23e47645caa8dd17e4ea576eef504a18f4032bef | |
| parent | 648fc450f3d0a8ec31661a9656f09c6c57615bc0 (diff) | |
| parent | 515b428ce709d0b71746903505dc0a7d1dde9519 (diff) | |
| download | openshift-dea7e61fd333b2e167cc5a001e1e8f794402c045.tar.gz openshift-dea7e61fd333b2e167cc5a001e1e8f794402c045.tar.bz2 openshift-dea7e61fd333b2e167cc5a001e1e8f794402c045.tar.xz openshift-dea7e61fd333b2e167cc5a001e1e8f794402c045.zip | |
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
| -rw-r--r-- | roles/openshift_cloud_provider/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/gce.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_gcp/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_gcp/tasks/node_cloud_config.yml | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_cloud_provider/defaults/main.yml b/roles/openshift_cloud_provider/defaults/main.yml index 37cbf5603..cda6acd90 100644 --- a/roles/openshift_cloud_provider/defaults/main.yml +++ b/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 diff --git a/roles/openshift_cloud_provider/tasks/gce.yml b/roles/openshift_cloud_provider/tasks/gce.yml index dff5fa09c..8b9c1b42a 100644 --- a/roles/openshift_cloud_provider/tasks/gce.yml +++ b/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 }}' } diff --git a/roles/openshift_gcp/defaults/main.yml b/roles/openshift_gcp/defaults/main.yml index 18fc453b2..f0cbb2f32 100644 --- a/roles/openshift_gcp/defaults/main.yml +++ b/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 diff --git a/roles/openshift_gcp/tasks/node_cloud_config.yml b/roles/openshift_gcp/tasks/node_cloud_config.yml index 4e982f497..c38a052ea 100644 --- a/roles/openshift_gcp/tasks/node_cloud_config.yml +++ b/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 }}' } |