From 19c0141676a978bb96ecf4ea4905e95d0dc4a344 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Thu, 17 Nov 2022 20:30:14 -0600 Subject: [PATCH] remove loadbalancer from installed definitions The example file was removed from ceilometer in 318c54648c2c85d4f4f5425c5ffc5e5f3dda86f2 Signed-off-by: Matthew Thode Change-Id: Ic23655e793aca9db344354ef95460858534c518c --- defaults/main.yml | 2 -- vars/main.yml | 9 --------- 2 files changed, 11 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index fc89ee6a..3dc04381 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -304,7 +304,6 @@ ceilometer_data_meters_default_file_path: "/etc/openstack_deploy/ceilometer/mete ceilometer_event_definitions_default_file_path: "/etc/openstack_deploy/ceilometer/event_definitions.yaml" ceilometer_event_pipeline_default_file_path: "/etc/openstack_deploy/ceilometer/event_pipeline.yaml" ceilometer_gnocchi_resources_default_file_path: "/etc/openstack_deploy/ceilometer/gnocchi_resources.yaml" -ceilometer_loadbalancer_v2_meter_definitions_default_file_path: "/etc/openstack_deploy/ceilometer/loadbalancer_v2_meter_definitions.yaml" ceilometer_osprofiler_event_definitions_default_file_path: "/etc/openstack_deploy/ceilometer/osprofiler_event_definitions.yaml" ceilometer_polling_default_file_path: "/etc/openstack_deploy/ceilometer/polling.yaml" ceilometer_pipeline_default_file_path: "/etc/openstack_deploy/ceilometer/pipeline.yaml" @@ -316,7 +315,6 @@ ceilometer_data_meters_yaml_overrides: {} ceilometer_event_definitions_yaml_overrides: {} ceilometer_event_pipeline_yaml_overrides: {} ceilometer_gnocchi_resources_yaml_overrides: {} -ceilometer_loadbalancer_v2_meter_definitions_yaml_overrides: {} ceilometer_osprofiler_event_definitions_yaml_overrides: {} ceilometer_pipeline_yaml_overrides: {} ceilometer_polling_yaml_overrides: {} diff --git a/vars/main.yml b/vars/main.yml index 02f189fa..965133b5 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -18,7 +18,6 @@ ceilometer_data_meters_user_content: "{{ lookup('file', ceilometer_data_meters_d ceilometer_event_definitions_user_content: "{{ lookup('file', ceilometer_event_definitions_default_file_path, errors='ignore') }}" ceilometer_event_pipeline_user_content: "{{ lookup('file', ceilometer_event_pipeline_default_file_path, errors='ignore') }}" ceilometer_gnocchi_resources_user_content: "{{ lookup('file', ceilometer_gnocchi_resources_default_file_path, errors='ignore') }}" -ceilometer_loadbalancer_v2_meter_definitions_user_content: "{{ lookup('file', ceilometer_loadbalancer_v2_meter_definitions_default_file_path, errors='ignore') }}" ceilometer_osprofiler_event_definitions_user_content: "{{ lookup('file', ceilometer_osprofiler_event_definitions_default_file_path, errors='ignore') }}" ceilometer_polling_user_content: "{{ lookup('file', ceilometer_polling_default_file_path, errors='ignore') }}" ceilometer_pipeline_user_content: "{{ lookup('file', ceilometer_pipeline_default_file_path, errors='ignore') }}" @@ -143,14 +142,6 @@ ceilometer_core_files: config_type: "yaml" list_extend: false content: "{{ ceilometer_polling_user_content }}" - - tmp_f: "{{ (ceilometer_loadbalancer_v2_meter_definitions_user_content | length > 0) | ternary(false, '/tmp/loadbalancer_v2_meter_definitions.yaml') }}" - source_f: "/etc/ceilometer/examples/loadbalancer_v2_meter_definitions.yaml" - target_f: "/etc/ceilometer/loadbalancer_v2_meter_definitions.yaml" - config_overrides: "{{ ceilometer_loadbalancer_v2_meter_definitions_yaml_overrides }}" - config_type: "yaml" - list_extend: false - content: "{{ ceilometer_loadbalancer_v2_meter_definitions_user_content }}" - condition: "{{ ceilometer_install_method == 'source' }}" - tmp_f: "{{ (ceilometer_osprofiler_event_definitions_user_content | length > 0) | ternary(false, '/tmp/osprofiler_event_definitions.yaml') }}" source_f: "/etc/ceilometer/examples/osprofiler_event_definitions.yaml" target_f: "/etc/ceilometer/osprofiler_event_definitions.yaml"