diff --git a/tasks/masakari_post_install.yml b/tasks/masakari_post_install.yml index d54e83d..a044eac 100644 --- a/tasks/masakari_post_install.yml +++ b/tasks/masakari_post_install.yml @@ -25,15 +25,15 @@ when: item.condition | default(True) with_items: - src: "api-paste.ini.j2" - dest: "/etc/masakari/api-paste.ini" + dest: "{{ masakari_etc_dir }}/api-paste.ini" config_overrides: "{{ masakari_api_paste_ini_overrides }}" config_type: "ini" - src: "masakari.conf.j2" - dest: "/etc/masakari/masakari.conf" + dest: "{{ masakari_etc_dir }}/masakari.conf" config_overrides: "{{ masakari_masakari_conf_overrides }}" config_type: "ini" - src: "policy.json.j2" - dest: "/etc/masakari/policy.json" + dest: "{{ masakari_etc_dir }}/policy.json" config_overrides: "{{ masakari_policy_json_overrides }}" config_type: "json" notify: diff --git a/tasks/masakari_pre_install.yml b/tasks/masakari_pre_install.yml index 93af487..2b0024f 100644 --- a/tasks/masakari_pre_install.yml +++ b/tasks/masakari_pre_install.yml @@ -40,7 +40,7 @@ mode: "{{ item.mode|default(omit) }}" with_items: - { path: "/openstack", mode: "0755", owner: "root", group: "root" } - - { path: "/etc/masakari", mode: "0750" } + - { path: "{{ masakari_etc_dir }}", mode: "0750" } - { path: "/var/cache/masakari" } - { path: "{{ masakari_system_user_home }}" } - { path: "{{ masakari_system_user_home }}/cache/api", mode: "0700" } diff --git a/templates/masakari.conf.j2 b/templates/masakari.conf.j2 index f2d928f..5cfbe8b 100644 --- a/templates/masakari.conf.j2 +++ b/templates/masakari.conf.j2 @@ -37,7 +37,7 @@ service_down_time = 60 [wsgi] # The paste configuration file path -api_paste_config = /etc/masakari/api-paste.ini +api_paste_config = {{ masakari_etc_dir }}/api-paste.ini [keystone_authtoken] auth_url = {{ keystone_service_adminuri }}