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
This commit is contained in:
parent
6d2ad6a004
commit
8ba1f3829b
@ -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
|
# paths will be used to find the files from the git config
|
||||||
# lookup location.
|
# lookup location.
|
||||||
ceilometer_git_config_lookup_location: https://git.openstack.org/cgit/openstack/ceilometer/plain
|
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_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_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 }}"
|
ceilometer_polling_git_file_path: "etc/ceilometer/polling.yaml?h={{ ceilometer_git_install_branch }}"
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
- "{{ ceilometer_git_config_lookup_location }}/{{ ceilometer_loadbalancer_v2_meter_definitions_git_file_path }}"
|
- "{{ 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_osprofiler_event_definitions_git_file_path }}"
|
||||||
- "{{ ceilometer_git_config_lookup_location }}/{{ ceilometer_polling_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
|
register: _git_file_fetch
|
||||||
|
|
||||||
- name: Copy ceilometer configuration files
|
- name: Copy ceilometer configuration files
|
||||||
@ -65,6 +66,11 @@
|
|||||||
config_type: "yaml"
|
config_type: "yaml"
|
||||||
list_extend: false
|
list_extend: false
|
||||||
content: "{{ ceilometer_polling_user_content | default(ceilometer_polling_default_content, true) }}"
|
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:
|
notify:
|
||||||
- Restart ceilometer services
|
- Restart ceilometer services
|
||||||
|
|
||||||
|
@ -42,3 +42,5 @@ ceilometer_oslomsg_amqp1_distro_packages:
|
|||||||
|
|
||||||
ceilometer_packages_to_symlink:
|
ceilometer_packages_to_symlink:
|
||||||
- libvirt-python
|
- libvirt-python
|
||||||
|
|
||||||
|
ceilometer_lib_dir: "/usr/lib/python2.7/site-packages"
|
||||||
|
@ -21,3 +21,5 @@ ceilometer_package_list: |-
|
|||||||
{{ packages }}
|
{{ packages }}
|
||||||
|
|
||||||
_ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"
|
_ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"
|
||||||
|
|
||||||
|
ceilometer_lib_dir: "{{ _ceilometer_bin | dirname }}/lib/python2.7/site-packages"
|
||||||
|
@ -45,3 +45,5 @@ ceilometer_oslomsg_amqp1_distro_packages:
|
|||||||
|
|
||||||
ceilometer_packages_to_symlink:
|
ceilometer_packages_to_symlink:
|
||||||
- "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
|
- "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
|
||||||
|
|
||||||
|
ceilometer_lib_dir: "/usr/lib/python2.7/site-packages"
|
||||||
|
@ -46,3 +46,5 @@ ceilometer_oslomsg_amqp1_distro_packages:
|
|||||||
ceilometer_packages_to_symlink:
|
ceilometer_packages_to_symlink:
|
||||||
- python-libvirt
|
- python-libvirt
|
||||||
- python3-libvirt
|
- python3-libvirt
|
||||||
|
|
||||||
|
ceilometer_lib_dir: "/usr/lib/python2.7/dist-packages"
|
||||||
|
Loading…
Reference in New Issue
Block a user