Skip to content

Commit da776ae

Browse files
committed
move defaults to module instead
Signed-off-by: Curtis Howard <curtis@cloudera.com>
1 parent e48f81a commit da776ae

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

roles/runtime/tasks/setup_base.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@
6565
name: "{{ __de_config_item.name }}"
6666
env: "{{ run__env_name }}"
6767
instance_type: "{{ __de_config_item.raw.instance_type | default(run__de_compute_default[run__infra_type]) }}"
68-
minimum_instances: "{{ __de_config_item.raw.minimum_instances | default(1) }}"
69-
maximum_instances: "{{ __de_config_item.raw.maximum_instances | default(4) }}"
70-
minimum_spot_instances: "{{ __de_config_item.raw.minimum_spot_instances | default(0) }}"
71-
maximum_spot_instances: "{{ __de_config_item.raw.maximum_spot_instances | default(0) }}"
68+
minimum_instances: "{{ __de_config_item.raw.minimum_instances | default(omit) }}"
69+
maximum_instances: "{{ __de_config_item.raw.maximum_instances | default(omit) }}"
70+
minimum_spot_instances: "{{ __de_config_item.raw.minimum_spot_instances | default(omit) }}"
71+
maximum_spot_instances: "{{ __de_config_item.raw.maximum_spot_instances | default(omit) }}"
7272
chart_value_overrides: "{{ __de_config_item.raw.chart_value_overrides | default(omit) }}"
73-
enable_public_endpoint: "{{ __de_config_item.raw.enable_public_endpoint | default(True) }}"
74-
enable_workload_analytics: "{{ __de_config_item.raw.enable_workload_analytics | default(True) }}"
75-
initial_instances: "{{ __de_config_item.raw.initial_instances | default(1) }}"
76-
initial_spot_instances: "{{ __de_config_item.raw.initial_spot_instances | default(0) }}"
73+
enable_public_endpoint: "{{ __de_config_item.raw.enable_public_endpoint | default(omit) }}"
74+
enable_workload_analytics: "{{ __de_config_item.raw.enable_workload_analytics | default(omit) }}"
75+
initial_instances: "{{ __de_config_item.raw.initial_instances | default(omit) }}"
76+
initial_spot_instances: "{{ __de_config_item.raw.initial_spot_instances | default(omit) }}"
7777
root_volume_size: "{{ __de_config_item.raw.root_volume_size | default(omit) }}"
7878
skip_validation: "{{ __de_config_item.raw.skip_validation | default(omit) }}"
7979
tags: "{{ __de_config_item.raw.tags | default(omit) }}"

roles/runtime/tasks/teardown_base.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@
8787
cloudera.cloud.de:
8888
name: "{{ __de_config_item.name }}"
8989
env: "{{ run__env_name }}"
90-
instance_type: "{{ __de_config_item.raw.instance_type }}"
91-
minimum_instances: "{{ __de_config_item.raw.minimum_instances }}"
92-
maximum_instances: "{{ __de_config_item.raw.maximum_instances }}"
9390
state: absent
9491
force_delete: "{{ run__de_force_delete }}"
9592
loop_control:

roles/runtime/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ run__datahub_storage_default:
6262

6363

6464
run__de_compute_default:
65-
aws: 'm5.4xlarge'
65+
aws: 'm5.2xlarge'
6666
azure: 'Standard_D8_v3'
6767
gcp: 'e2-standard-8'

0 commit comments

Comments
 (0)