diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index 3eeb99d5..303b987e 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -491,17 +491,3 @@ nginx_worker_processes: 1 nginx_worker_connections: "{{ uwsgi_listen_queue_size }}" nginx_worker_cpu_affinity: 'auto' nginx_listen_queue_size: "{{ uwsgi_listen_queue_size }}" - -# metrics-utility (github.com/ansible/metrics-utility) -_metrics_utility_enabled: "{{ metrics_utility_enabled | default(false) }}" -_metrics_utility_configmap: "{{ metrics_utility_configmap | default(deployment_type + '-metrics-utility-configmap') }}" -_metrics_utility_secret: "{{ metrics_utility_secret | default(deployment_type + '-metrics-utility-secret') }}" -_metrics_utility_console_enabled: "{{ metrics_utility_console_enabled | default(false) }}" -_metrics_utility_image: "{{ metrics_utility_image | default(_image) }}" -_metrics_utility_image_version: "{{ metrics_utility_image_version | default(_image_version) }}" -_metrics_utility_image_pull_policy: "{{ metrics_utility_image_pull_policy | default('IfNotPresent') }}" -_metrics_utility_ship_target: "{{ metrics_utility_ship_target | default('directory') }}" -_metrics_utility_pvc_claim: "{{ metrics_utility_pvc_claim | default(deployment_type + '-metrics-utility') }}" -_metrics_utility_pvc_claim_size: "{{ metrics_utility_pvc_claim_size | default('5Gi') }}" -_metrics_utility_cronjob_gather_schedule: "{{ metrics_utility_cronjob_gather_schedule | default('@hourly') }}" -_metrics_utility_cronjob_report_schedule: "{{ metrics_utility_cronjob_report_schedule | default('@monthly') }}" diff --git a/roles/installer/vars/main.yml b/roles/installer/vars/main.yml index 6492f322..fc4cde3a 100644 --- a/roles/installer/vars/main.yml +++ b/roles/installer/vars/main.yml @@ -8,3 +8,16 @@ supported_pg_version: 15 _previous_upgraded_pg_version: 0 old_postgres_pod: [] _postgres_data_path: '/var/lib/pgsql/data/userdata' +# metrics-utility (github.com/ansible/metrics-utility) +_metrics_utility_enabled: "{{ metrics_utility_enabled | default(false) }}" +_metrics_utility_configmap: "{{ metrics_utility_configmap | default(deployment_type + '-metrics-utility-configmap') }}" +_metrics_utility_secret: "{{ metrics_utility_secret | default('') }}" +_metrics_utility_console_enabled: "{{ metrics_utility_console_enabled | default(false) }}" +_metrics_utility_image: "{{ metrics_utility_image | default(_image) }}" +_metrics_utility_image_version: "{{ metrics_utility_image_version | default(_image_version) }}" +_metrics_utility_image_pull_policy: "{{ metrics_utility_image_pull_policy | default('IfNotPresent') }}" +_metrics_utility_ship_target: "{{ metrics_utility_ship_target | default('directory') }}" +_metrics_utility_pvc_claim: "{{ metrics_utility_pvc_claim | default(deployment_type + '-metrics-utility') }}" +_metrics_utility_pvc_claim_size: "{{ metrics_utility_pvc_claim_size | default('5Gi') }}" +_metrics_utility_cronjob_gather_schedule: "{{ metrics_utility_cronjob_gather_schedule | default('@hourly') }}" +_metrics_utility_cronjob_report_schedule: "{{ metrics_utility_cronjob_report_schedule | default('@monthly') }}"