diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-02-12 16:31:19 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-02-12 16:31:19 -0500 |
| commit | 515b428ce709d0b71746903505dc0a7d1dde9519 (patch) | |
| tree | 303c2b4c42aeeb3e99b1ebff9ed835c773d83089 | |
| parent | f9f61beed982ba841c872b5fc082c6dc05ad27b1 (diff) | |
| download | openshift-515b428ce709d0b71746903505dc0a7d1dde9519.tar.gz openshift-515b428ce709d0b71746903505dc0a7d1dde9519.tar.bz2 openshift-515b428ce709d0b71746903505dc0a7d1dde9519.tar.xz openshift-515b428ce709d0b71746903505dc0a7d1dde9519.zip | |
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 9e1c31b1d..34734892f 100644 --- a/roles/openshift_cloud_provider/tasks/gce.yml +++ b/roles/openshift_cloud_provider/tasks/gce.yml @@ -28,4 +28,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 }}' } |