From 8ba1f3829bf364f6b29295ae33a46f1dcae5735c Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotjagov Date: Wed, 5 Dec 2018 14:59:24 +0200 Subject: [PATCH] gnocchi_resources override fixed gnocchi_resources.yaml has been defined in main.yml, had all required variables, but user overrides were not actually deployed on containers Also, it had an absolete path in GIT repo. Change-Id: Id32789b59f913cfbb78c1cb4a73b18df85c36655 --- defaults/main.yml | 2 +- tasks/ceilometer_post_install.yml | 6 ++++++ vars/redhat-7.yml | 2 ++ vars/source_install.yml | 2 ++ vars/suse.yml | 2 ++ vars/ubuntu.yml | 2 ++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5a5fc6a2..3ea16d9b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -297,7 +297,7 @@ ceilometer_polling_default_file_path: "/etc/openstack_deploy/ceilometer/polling. # paths will be used to find the files from the git config # lookup location. ceilometer_git_config_lookup_location: https://git.openstack.org/cgit/openstack/ceilometer/plain -ceilometer_gnocchi_resources_git_file_path: "ceilometer/dispatcher/data/gnocchi_resources.yaml?h={{ ceilometer_git_install_branch }}" +ceilometer_gnocchi_resources_git_file_path: "ceilometer/publisher/data/gnocchi_resources.yaml?h={{ ceilometer_git_install_branch }}" ceilometer_loadbalancer_v2_meter_definitions_git_file_path: "etc/ceilometer/examples/loadbalancer_v2_meter_definitions.yaml?h={{ ceilometer_git_install_branch }}" ceilometer_osprofiler_event_definitions_git_file_path: "etc/ceilometer/examples/osprofiler_event_definitions.yaml?h={{ ceilometer_git_install_branch }}" ceilometer_polling_git_file_path: "etc/ceilometer/polling.yaml?h={{ ceilometer_git_install_branch }}" diff --git a/tasks/ceilometer_post_install.yml b/tasks/ceilometer_post_install.yml index c4e15c51..1312fe50 100644 --- a/tasks/ceilometer_post_install.yml +++ b/tasks/ceilometer_post_install.yml @@ -21,6 +21,7 @@ - "{{ ceilometer_git_config_lookup_location }}/{{ ceilometer_loadbalancer_v2_meter_definitions_git_file_path }}" - "{{ ceilometer_git_config_lookup_location }}/{{ ceilometer_osprofiler_event_definitions_git_file_path }}" - "{{ ceilometer_git_config_lookup_location }}/{{ ceilometer_polling_git_file_path }}" + - "{{ ceilometer_git_config_lookup_location }}/{{ ceilometer_gnocchi_resources_git_file_path }}" register: _git_file_fetch - name: Copy ceilometer configuration files @@ -65,6 +66,11 @@ config_type: "yaml" list_extend: false content: "{{ ceilometer_polling_user_content | default(ceilometer_polling_default_content, true) }}" + - dest: "{{ ceilometer_lib_dir }}/ceilometer/publisher/data/gnocchi_resources.yaml" + config_overrides: "{{ ceilometer_gnocchi_resources_yaml_overrides }}" + config_type: "yaml" + list_extend: false + content: "{{ ceilometer_gnocchi_resources_user_content | default(ceilometer_gnocchi_resources_default_content, true) }}" notify: - Restart ceilometer services diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 91997911..1113946a 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -42,3 +42,5 @@ ceilometer_oslomsg_amqp1_distro_packages: ceilometer_packages_to_symlink: - libvirt-python + +ceilometer_lib_dir: "/usr/lib/python2.7/site-packages" diff --git a/vars/source_install.yml b/vars/source_install.yml index a1766e0a..09d24535 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -21,3 +21,5 @@ ceilometer_package_list: |- {{ packages }} _ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin" + +ceilometer_lib_dir: "{{ _ceilometer_bin | dirname }}/lib/python2.7/site-packages" diff --git a/vars/suse.yml b/vars/suse.yml index 8f8fa3e7..f232b815 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -45,3 +45,5 @@ ceilometer_oslomsg_amqp1_distro_packages: ceilometer_packages_to_symlink: - "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}" + +ceilometer_lib_dir: "/usr/lib/python2.7/site-packages" diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index a1acddd0..b7b957e3 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -46,3 +46,5 @@ ceilometer_oslomsg_amqp1_distro_packages: ceilometer_packages_to_symlink: - python-libvirt - python3-libvirt + +ceilometer_lib_dir: "/usr/lib/python2.7/dist-packages"